Commit Graph
2489 Commits
Author SHA1 Message Date
高嵩 4424ee1540 合并分支 'feature_dev_20221129_UI' 到 'master'
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!283
2023-02-11 21:51:40 +08:00
高嵩 666bcc10ff 撤销 "Merge branch 'feature_20221014_noLogo' into 'master'"
这将还原提交 0fc81dd9fa
2023-02-03 15:19:11 +08:00
高嵩 0fc81dd9fa Merge branch 'feature_20221014_noLogo' into 'master'
# Conflicts:
#   jero-web/src/views/projectManagement/components/TaskList.vue
2023-02-03 10:30:13 +08:00
高嵩 ff127719c5 合并分支 'fix_2nd_20230103' 到 'master'
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!279
2023-01-13 17:23:59 +08:00
sunFlower b5b214099f 修改评估结果的页面布局 2023-01-13 14:09:23 +08:00
高嵩 da302e52f8 Merge remote-tracking branch 'origin/fix_2nd_20230103'
# Conflicts:
#	jero-web/src/views/projectManagement/components/listAddModel.vue
2023-01-12 21:09:27 +08:00
高嵩 8e94c26f09 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 18:41:56 +08:00
高嵩 c57ec9ff59 修改UI 2023-01-12 18:41:45 +08:00
zyx.net dc540cee33 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 18:23:47 +08:00
zyx.net aae6064df3 添加清单UI修改 2023-01-12 18:22:36 +08:00
sunFlower ebe018bb1a 修改高级搜索 2023-01-12 17:21:37 +08:00
zyx.net 4431d63afc 调取 高级搜索 顺序调整 2023-01-12 17:09:42 +08:00
zyx.net 78fe3d9913 调取功能增加高级搜索 2023-01-12 16:36:30 +08:00
zyx.net be9fddb19a 清单模板显示除任务信息外的全部字段 2023-01-12 15:13:38 +08:00
zyx.net 14f92624e6 法规清单列表上方搜索添加责任领域 2023-01-12 10:29:24 +08:00
zyx.net 5328d18ba4 法规清单列表上方搜索添加责任领域 2023-01-12 10:28:16 +08:00
zyx.net 1d5501b82d 法规清单调取需可以全选 2023-01-12 10:12:01 +08:00
zyx.net ae23112438 参数收集--引用参数列 表格单选 2023-01-12 10:08:32 +08:00
zyx.net bb9714da8a 知识分享联系创建人改为联系作者 2023-01-12 09:57:14 +08:00
刘彦泽 19fd59fb4a 文档拆分-拆分已入库文本-表单 2023-01-10 11:25:23 +08:00
刘彦泽 b182261da0 待办中心-法规评估任务-表格居左对齐 2023-01-10 10:18:04 +08:00
刘彦泽 332872f076 任务清单-系统表格高度 2023-01-10 09:59:35 +08:00
高嵩 5dc21849c2 合并分支 'fix_2nd_20230103' 到 'master'
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!276
2023-01-09 21:41:25 +08:00
高嵩 19e8a632e3 用户管理 角色配置 viewer责任领域配置bug 2023-01-09 21:40:30 +08:00
刘彦泽 a857f218ea 系统表格高度 2023-01-09 17:32:51 +08:00
高嵩 d3d9e8eb2b 合并分支 'fix_2nd_20230103' 到 'master'
用户管理 角色配置 viewer责任领域配置bug

查看合并请求 laws-nio/laws-weilai!275
2023-01-09 15:36:13 +08:00
高嵩 c2239e216e 用户管理 角色配置 viewer责任领域配置bug 2023-01-09 15:34:37 +08:00
刘彦泽 f091e8224a 文档拆分详情-批量设置-表单字体 2023-01-09 09:29:14 +08:00
高嵩 8574bb3849 合并分支 'feature_dev_20221129_UI' 到 'master'
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!274
2023-01-07 08:19:05 +08:00
刘彦泽 9e87e5ca18 项目库-法规意见收集-法规技术评估-品牌表头居左 2023-01-06 14:21:27 +08:00
刘彦泽 05c9236b7c UI界面变更-项目详情-认证参数列表表格 2023-01-06 10:21:47 +08:00
zyx.net 0fe60644a9 用户管理 责任领域添加全选功能 2023-01-06 09:53:33 +08:00
刘彦泽 970c2b8fca UI界面变更-法规清单-评论-按钮 2023-01-06 09:53:18 +08:00
刘彦泽 c28f9128a3 UI界面变更-项目详情-法规清单-添加表单样式 2023-01-05 14:47:38 +08:00
刘彦泽 b3a094d0af UI界面变更-参数项收集清单-添加 2023-01-05 09:54:43 +08:00
zyx.net e7fcfb8903 参数批次传参修改 2023-01-04 17:58:05 +08:00
刘彦泽 e9a97398f3 UI界面变更-项目状态看板-提示框 2023-01-04 16:38:08 +08:00
zyx.net 9f09756fe6 认证参数列表 列表查询请求方式修改 2023-01-04 14:54:39 +08:00
zyx.net 0369369ec4 认证参数收集清单-高级搜索传参方式修改 2023-01-04 14:41:45 +08:00
高嵩 7f5633d885 合并分支 'feature_dev_20221129_UI' 到 'master'
UI界面变更-首页

查看合并请求 laws-nio/laws-weilai!270
2022-12-30 20:16:42 +08:00
刘彦泽 a24f5ebd57 UI界面变更-首页 2022-12-30 17:12:28 +08:00
高嵩 b0b8f36e92 Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period
# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
2022-12-30 15:53:39 +08:00
高嵩 ca074ee4c6 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:54:11 +08:00
高嵩 63ef89834e 文档拆分 上移下移按钮权限 2022-12-30 14:54:00 +08:00
刘彦泽 2154e4edfe UI界面变更-个人中心-流程配置 2022-12-30 14:45:08 +08:00
刘彦泽 b6c8917317 UI界面变更-文档翻译-调取已入库文件 2022-12-30 14:35:02 +08:00
刘彦泽 4545f9fc44 UI界面变更-项目库-项目详情-相关人员名单 2022-12-30 14:32:05 +08:00
zyx.net 4bc594317d Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:07:28 +08:00
zyx.net a928fa6b9e 法规符合性看板中,标题链接跳转 2022-12-30 14:07:10 +08:00
CD ebfac5f334 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:03:00 +08:00