Commit Graph
5555 Commits
Author SHA1 Message Date
zyx.net aae6064df3 添加清单UI修改 2023-01-12 18:22:36 +08:00
zyx.net add5d0dedf Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 17:11:17 +08:00
zyx.net 4431d63afc 调取 高级搜索 顺序调整 2023-01-12 17:09:42 +08:00
zhn 9ae3fdcdd0 法规清单,虚拟清单高级搜索--适用地区修改 2023-01-12 16:40:29 +08:00
zyx.net 78fe3d9913 调取功能增加高级搜索 2023-01-12 16:36:30 +08:00
zyx.net 8ca063c633 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 15:14:42 +08:00
zyx.net be9fddb19a 清单模板显示除任务信息外的全部字段 2023-01-12 15:13:38 +08:00
zhn 77ff0f32d8 项目库置顶sql 2023-01-12 15:02:15 +08:00
zhn 5bd89aa63e 项目库--置顶修改 2023-01-12 14:59:11 +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 9547c0d6b6 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 09:58:22 +08:00
zyx.net bb9714da8a 知识分享联系创建人改为联系作者 2023-01-12 09:57:14 +08:00
zhn 653da23e05 文档库--适用地区搜索 2023-01-11 15:10:32 +08:00
高嵩 19e8a632e3 用户管理 角色配置 viewer责任领域配置bug 2023-01-09 21:40:30 +08:00
zhn dca48af888 文档动态--上传文件 2023-01-09 17:04:47 +08:00
高嵩 c2239e216e 用户管理 角色配置 viewer责任领域配置bug 2023-01-09 15:34:37 +08:00
wangzhijiang be3d6a9f00 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-06 17:10:06 +08:00
wangzhijiang b24ed1a7ac 参数项收集清单-列表查询高级查询。 2023-01-06 17:09:50 +08:00
高嵩 491dd13e4d 处理导出参数清单空指针问题。 2023-01-06 16:56:21 +08:00
高嵩 3643370ec1 处理导出参数清单空指针问题。 2023-01-06 16:54:51 +08:00
刘彦泽 9e87e5ca18 项目库-法规意见收集-法规技术评估-品牌表头居左 2023-01-06 14:21:27 +08:00
zyx.net 0fe60644a9 用户管理 责任领域添加全选功能 2023-01-06 09:53:33 +08:00
zyx.net e7fcfb8903 参数批次传参修改 2023-01-04 17:58:05 +08:00
zyx.net 9f09756fe6 认证参数列表 列表查询请求方式修改 2023-01-04 14:54:39 +08:00
zyx.net 0369369ec4 认证参数收集清单-高级搜索传参方式修改 2023-01-04 14:41:45 +08:00
wangzhijiang 034c7ab2eb 参数收集、参数模板管理、上报库管理,检索编号问题处理。 2023-01-03 18:04:37 +08:00
wangzhijiang 1e911f50ff 知识分享-联系创建人-获取用户飞书信息接口修改。 2023-01-03 13:52:28 +08:00
高嵩 7f5633d885 合并分支 'feature_dev_20221129_UI' 到 'master'
UI界面变更-首页

查看合并请求 laws-nio/laws-weilai!270
2022-12-30 20:16:42 +08:00
高嵩 0f09c75dce 合并分支 'fix_2nd_period' 到 'master'
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!269
2022-12-30 20:16:28 +08:00
wangzhijiang e3273a8765 update 2022-12-30 18:32:12 +08:00
wangzhijiang f03ef8f9a8 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 18:19:03 +08:00
wangzhijiang 5437d55fab 64614 参数项收集清单--导出--参考列未正常回显 2022-12-30 18:18:41 +08:00
zhn de33009941 法规月报导出 2022-12-30 18:10:16 +08:00
wangzhijiang cae323e674 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 17:47:26 +08:00
wangzhijiang 0fa7d983d9 64616 认证参数收集--认证工程师、工程接口人--导出 参考列上传的附件未正常回显 2022-12-30 17:47:03 +08:00
刘彦泽 a24f5ebd57 UI界面变更-首页 2022-12-30 17:12:28 +08:00
CD eed32438fd 权限同步接口加log日志 2022-12-30 16:32:25 +08:00
CD 7e1ca22b20 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 16:17:14 +08:00
CD 4870e782a8 加上@transactional注解 2022-12-30 16:16:52 +08:00
高嵩 195417c2d8 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 15:53:54 +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
CD f7cae9babc Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 15:42:53 +08:00
CD b167ee2878 把直接返回注掉,防止他查不出viewer 2022-12-30 15:41:41 +08:00
高嵩 07c02abef6 同步上产数据库结构 2022-12-30 15:36:04 +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