Commit Graph
5606 Commits
Author SHA1 Message Date
高嵩 b43cc4a60f Merge branch 'feature_dev_20230105_ZDYBT'
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/customizeList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
2023-02-11 22:10:12 +08:00
高嵩 5ad54639e1 合并分支 'revert-0fc81dd9' 到 'master'
撤销 "Merge branch 'feature_20221014_noLogo' into 'master'"

查看合并请求 laws-nio/laws-weilai!281
2023-02-03 15:19:27 +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
zhn 421aa6778b 项目库列表查询 2023-01-13 14:07:30 +08:00
高嵩 770bd8a418 更新sql 2023-01-13 08:59:56 +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 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
高嵩 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
zyx.net 1ed4250bc0 法规清单表头高度修改 2023-01-09 17:55:44 +08:00
zhn dca48af888 文档动态--上传文件 2023-01-09 17:04:47 +08:00
zyx.net e70c438e6f 自定义表头 2023-01-09 16:15:19 +08:00
zyx.net 4e6996e15d Merge remote-tracking branch 'origin/feature_dev_20230105_ZDYBT' into feature_dev_20230105_ZDYBT 2023-01-09 15:58:20 +08:00
zyx.net 8038fa4d7a 自定义表头 2023-01-09 15:57:58 +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
zhn 0ca43fa19e 自定义列表表头 2023-01-09 11:55:09 +08:00
zhn dba8529941 自定义表头 2023-01-09 11:49:46 +08:00
zhn 75df08798e 自定义列表 2023-01-09 11:42:51 +08:00
zhn 9854157768 自定义表头 2023-01-09 11:10:05 +08:00
zhn 7fbbc9c522 自定义表头 2023-01-09 09:58:16 +08:00
zhn 14ab5b1877 自定义表头 2023-01-09 09:38:38 +08:00
zhn 91a3c16956 自定义表头参数接收 2023-01-09 09:18:37 +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
高嵩 6ce825174a 合并分支 'fix_2nd_20230103' 到 'master'
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!273
2023-01-07 08:18:38 +08:00
zyx.net 43af0f8c23 法规清单 自定义表头数据转换json 2023-01-06 17:28:29 +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