 zyx.net
|
ca3b38a9f2
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-30 10:53:19 +08:00 |
|
|
zyx.net
|
46a89d7b4a
|
参数收集--历史记录中的引号不对称
|
2022-12-30 10:52:07 +08:00 |
|
|
CD
|
5cbf5d19b5
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-30 10:13:49 +08:00 |
|
|
CD
|
93b12b94ee
|
viewer权限显示补充
|
2022-12-30 10:13:20 +08:00 |
|
|
zhn
|
685a471bb1
|
虚拟清单和法规清单--认证级别排序
|
2022-12-30 10:12:28 +08:00 |
|
|
zyx.net
|
c9891afed0
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 17:44:08 +08:00 |
|
|
zyx.net
|
05426961e4
|
人员管理-选择一个人员-点击角色配置-选择角色为品牌管理员，弹框中没有显示品牌选择框
|
2022-12-29 17:43:42 +08:00 |
|
|
高嵩
|
f4c4769707
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 17:37:26 +08:00 |
|
|
高嵩
|
6118ecfea6
|
Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period
|
2022-12-29 17:37:10 +08:00 |
|
|
zyx.net
|
a34e928b0e
|
没有开始收集的参数清单时，提示信息不准确
|
2022-12-29 17:36:46 +08:00 |
|
|
zyx.net
|
0ad673fced
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 17:17:00 +08:00 |
|
|
zyx.net
|
e2b4d17ee9
|
参数导出模板管理--适用地区没有表头排序
参数模板管理-表头有两个适用地区
|
2022-12-29 17:16:19 +08:00 |
|
|
zhn
|
e291acc6d2
|
上报库表头排序
|
2022-12-29 17:09:21 +08:00 |
|
|
zhn
|
a9fc1cf3e1
|
虚拟清单表头排序
|
2022-12-29 17:04:04 +08:00 |
|
|
wangzhijiang
|
7cd46586a7
|
任务清单-查询处理责任领域空指针处理。
|
2022-12-29 17:02:25 +08:00 |
|
|
wangzhijiang
|
ed5769428c
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 16:09:57 +08:00 |
|
|
wangzhijiang
|
479d17b03a
|
参数清单历史-增加参考列配置id字段sql
|
2022-12-29 16:09:31 +08:00 |
|
|
zhn
|
849f382be5
|
参数项收集清单--标题回显
|
2022-12-29 16:08:53 +08:00 |
|
|
zyx.net
|
2105d9bb0a
|
虚拟清单按钮权限修改
|
2022-12-29 15:42:44 +08:00 |
|
|
CD
|
9f591d67fc
|
项目列表添加品牌搜索条件
|
2022-12-29 15:32:32 +08:00 |
|
|
zyx.net
|
eef54b1e6a
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 15:28:11 +08:00 |
|
|
zyx.net
|
40f1fbec1e
|
引用参数列搜索问题
|
2022-12-29 15:27:53 +08:00 |
|
|
wangzhijiang
|
fe129e8621
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 15:21:33 +08:00 |
|
|
wangzhijiang
|
b574bd6ac7
|
64523、64518bug处理。
|
2022-12-29 15:20:56 +08:00 |
|
|
zhn
|
8f606ffcb4
|
虚拟清单列表页不做权限区分
|
2022-12-29 14:46:20 +08:00 |
|
|
wangzhijiang
|
daf9a5483c
|
update
|
2022-12-29 13:48:32 +08:00 |
|
|
wangzhijiang
|
a916236a2b
|
64493 编辑项目库异常处理。
|
2022-12-29 13:45:42 +08:00 |
|
|
wangzhijiang
|
6df3edd683
|
64510 【英文】上报库--操作列展示中文问题修改。
|
2022-12-29 11:48:38 +08:00 |
|
|
zyx.net
|
6befb0b445
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 10:58:05 +08:00 |
|
|
zyx.net
|
5f15471526
|
历史记录分页问题
参考列查看回显
|
2022-12-29 10:57:25 +08:00 |
|
|
wangzhijiang
|
4bad7375d8
|
上报库备注字段长度修改sql
|
2022-12-29 10:51:10 +08:00 |
|
|
wangzhijiang
|
e1ece038a7
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-29 10:45:05 +08:00 |
|
|
wangzhijiang
|
6627668f33
|
64462 参考参数列-查看 配置信息未回显处理。
|
2022-12-29 10:44:49 +08:00 |
|
|
高嵩
|
2e801f5bca
|
合并dev代码
|
2022-12-29 10:22:43 +08:00 |
|
|
高嵩
|
3c8cfab750
|
Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period
|
2022-12-29 10:21:36 +08:00 |
|
|
wangzhijiang
|
5f9d133c69
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-28 17:19:22 +08:00 |
|
|
wangzhijiang
|
21a2dccbe7
|
参数清单-增加未收集状态，对应禅道BUG编号 64312
|
2022-12-28 17:19:03 +08:00 |
|
|
zhn
|
91947c4624
|
文档库排序
|
2022-12-28 16:53:46 +08:00 |
|
|
zhn
|
f67172f4f0
|
处理代码合并问题
|
2022-12-28 16:38:34 +08:00 |
|
|
zyx.net
|
b05f2bf3c9
|
合并代码
|
2022-12-28 16:12:31 +08:00 |
|
|
zyx.net
|
469265a730
|
参数收集清单删除增加未收集状态情况
|
2022-12-28 14:41:04 +08:00 |
|
|
zyx.net
|
8f754abc57
|
上报库列表字段调整
|
2022-12-28 11:09:47 +08:00 |
|
|
wangzhijiang
|
eb9e1f78f4
|
Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
|
2022-12-28 10:19:55 +08:00 |
|
|
wangzhijiang
|
d094c003c2
|
上报库-列表展示表头排序、固定左侧列标识（NIO编号、参数名称） 对应禅道BUG - 64251
|
2022-12-28 10:19:41 +08:00 |
|
|
高嵩
|
f4d1b8676a
|
Merge remote-tracking branch 'origin/feature_dev_20221125_YW' into fix_2nd_period
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_2nd_period.sql
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
|
2022-12-28 09:58:11 +08:00 |
|
|
高嵩
|
4633d465f3
|
Merge branch 'dev_2nd_period_test' into fix_2nd_period
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_2nd_period.sql
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
# jero-web/src/views/projectManagement/components/TaskList.vue
# jero-web/src/views/projectManagement/components/listOfRegulations.vue
|
2022-12-28 09:53:38 +08:00 |
|
|
高嵩
|
34359f65a5
|
去掉暂存的AutoLog
|
2022-12-28 09:34:10 +08:00 |
|
|
wangzhijiang
|
83b805edaa
|
参数收集清单
1.同步上报库
2.认证工程师、工程接口人、填写人 退回
3.认证工程师、工程接口人 强制撤回
4.工程接口人分配填写人
5.填写人提交
操作增加历史log
|
2022-12-27 17:46:24 +08:00 |
|
|
CD
|
8cb780919d
|
Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test
|
2022-12-27 16:11:46 +08:00 |
|
|
CD
|
ca1fb97fc5
|
前端品牌回显 + 后端大列表修改权限筛选
|
2022-12-27 16:11:22 +08:00 |
|