Commit Graph
906 Commits
Author SHA1 Message Date
刘彦泽 d00d61c078 UI界面变更(项目状态看板,项目库,知识分享) 2022-12-02 16:12:48 +08:00
刘彦泽 31bcf72d31 UI界面变更 2022-12-02 13:36:24 +08:00
sunFlower acd051edcd 修改项目状态看板去掉目标市场 2022-11-29 10:13:07 +08:00
sunFlower 1944cd5122 修改法规清单的拖动 2022-11-29 10:06:27 +08:00
liyawei 1c20e1c637 认证-参数项收集-编号搜索 2022-11-28 20:37:27 +08:00
liyawei cf54c4271b 认证-参数清单-参数导出改为同步 2022-11-24 11:31:53 +08:00
高嵩 e1a971fa71 修改优化点 2022-11-22 15:21:27 +08:00
CD b702a32c9e viewer根据责任领域筛选任务清单 2022-11-18 17:13:34 +08:00
CD d9b3f32594 法规清单列表 viewer查看权限 2022-11-18 10:13:53 +08:00
zyx.net ccc0cb5512 修改认证 2022-11-16 16:06:59 +08:00
zyx.net afb50c3fa9 用户管理修改 2022-11-16 11:21:09 +08:00
sunFlower 24e4ced3f7 修改任务清单的参数 2022-11-15 09:23:21 +08:00
sunFlower 4bc4f6144c 修改任务清单的参数 2022-11-14 13:43:19 +08:00
高嵩 3bac043816 合并分支 'dev_third_stage' 到 'master'
修改

查看合并请求 laws-nio/laws-weilai!242
2022-11-08 21:35:24 +08:00
sunFlower 03de688e71 修改 2022-11-08 21:34:37 +08:00
sunFlower d245dbf63a 修改 2022-11-08 21:31:50 +08:00
高嵩 713c935304 合并分支 'dev_third_stage' 到 'master'
修改问题知识库的显示方式

查看合并请求 laws-nio/laws-weilai!240
2022-11-08 20:34:06 +08:00
sunFlower fc88fea19d 修改问题知识库的显示方式 2022-11-07 18:42:49 +08:00
sunFlower 7e63cb8a4a 修改禅道已知bug 2022-11-04 17:17:56 +08:00
zyx.net 314e9a9657 Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-04 13:41:17 +08:00
zyx.net 3cacb86a8b 项目详情-认证参数列表中清单编辑去掉可以修改模板 2022-11-04 13:39:31 +08:00
sunFlower c52d46e4e8 修改禅道已知bug 2022-11-04 11:54:58 +08:00
高嵩 aed6f23880 合并代码 2022-11-03 15:32:47 +08:00
787203167 0058770d36 Merge branch 'dev_2nd_period_test' into 'feature_dev_20221008_TODO'
# Conflicts:
#   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/ParamsManifestEOMapper.xml
2022-11-03 14:41:16 +08:00
787203167 a26bae373e Merge branch 'dev_2nd_period_test' into 'dev_third_stage'
# Conflicts:
#   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/cuibanModel.vue
2022-11-03 14:39:38 +08:00
高嵩 3f7ad00c1d Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
2022-11-03 14:32:08 +08:00
zyx.net 079a49ee5d 参数项收集清单导入导出修改 2022-11-03 10:41:44 +08:00
zyx.net abe7dcafaa 参数收集待办任务跳转修改 2022-11-02 18:16:04 +08:00
zyx.net 53bae2d6d1 任务清单增加催办错误提示 2022-11-02 11:44:41 +08:00
zyx.net 7ae9f2de69 任务清单增加催办功能 2022-11-02 10:46:32 +08:00
zyx.net c145f18ad1 任务清单增加催办功能 2022-11-02 10:08:41 +08:00
zyx.net 38e8f211d6 任务清单增加催办功能 2022-11-02 09:16:28 +08:00
高嵩 632af0d148 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!227
2022-11-02 09:08:16 +08:00
高嵩 cf6a9fa0cd 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!226
2022-11-02 09:07:54 +08:00
zyx.net e1430d1413 填写人导出搜索条件修改 2022-11-01 16:35:57 +08:00
sunFlower 81c9c76fb0 修改禅道已知bug 2022-11-01 16:12:53 +08:00
sunFlower 923e099599 修改禅道已知bug 2022-11-01 15:36:11 +08:00
sunFlower 2214853d6a 修改禅道已知bug 2022-11-01 14:26:45 +08:00
sunFlower 58efb3b360 修改禅道已知bug 2022-11-01 14:14:54 +08:00
高嵩 cd6dc3c44a Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
2022-10-28 16:34:39 +08:00
zyx.net e3e14194e9 参数项收集清单填写人导出功能 2022-10-28 09:41:59 +08:00
高嵩 c3adfe0e49 Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into dev_2nd_period_test 2022-10-27 15:23:17 +08:00
zyx.net e7258052d1 收集清单柱状图,收集清单下拉框宽度修改 2022-10-27 11:55:48 +08:00
zyx.net 55f74e8b64 1.收集清单柱状图,收集清单下拉框宽度修改
2.参数项收集清单填写人增加导入导出功能
2022-10-27 11:11:16 +08:00
高嵩 3ba0ae2367 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/store/modules/user.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
2022-10-27 09:49:39 +08:00
sunFlower a7d65bddea 修改禅道已知bug 2022-10-26 09:28:49 +08:00
sunFlower 440cf115b3 修改消息通知 2022-10-25 09:44:34 +08:00
高嵩 798a3b5161 Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
2022-10-24 10:09:49 +08:00
sunFlower 7ebbe9c130 对接项目库嘚变更 2022-10-21 17:41:50 +08:00
sunFlower 6ded489ed5 对接项目库嘚变更 2022-10-21 17:32:14 +08:00