Commit Graph
4986 Commits
Author SHA1 Message Date
高嵩 c3adfe0e49 Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into dev_2nd_period_test 2022-10-27 15:23:17 +08:00
高嵩 06d6b6d1c7 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test 2022-10-27 15:22:49 +08:00
高嵩 8d75dbe38d Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-10-27 15:22:04 +08:00
高嵩 8fd885a8fa Merge remote-tracking branch 'origin/feature_dev_20221025_message' 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/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
2022-10-27 15:21:33 +08:00
高嵩 74c8efc643 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!212
2022-10-27 15:15:44 +08:00
wangzhijiang 5c1f217dcb 待办中心-查询完善。 2022-10-27 15:13:39 +08:00
zhn 5701e0e59f 主要内容--设置页边距, 内容预留空格 2022-10-27 15:06:16 +08:00
zhn 73f67a1d3b 月报导出--数据字典换行 2022-10-27 14:51:43 +08:00
高嵩 09cb1b2210 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-27 14:23:27 +08:00
高嵩 0b13133720 空指针 2022-10-27 14:23:10 +08:00
zhn b511a20216 月报导出与标题模板顺序一致 2022-10-27 14:19:30 +08:00
sunFlower ed5354b8a6 修改禅道已知bug 2022-10-27 14:15:39 +08:00
wangzhijiang a6e36cfd51 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO 2022-10-27 14:12:20 +08:00
wangzhijiang 99364d52f3 法规评估任务处理标准信息展示。拼接中英文展示 与查询处理。 2022-10-27 14:11:33 +08:00
sunFlower 7dc56839b4 修改禅道已知bug 2022-10-27 14:09:46 +08:00
zyx.net e7258052d1 收集清单柱状图,收集清单下拉框宽度修改 2022-10-27 11:55:48 +08:00
sunFlower 60e585043f 修改禅道已知bug 2022-10-27 11:35:45 +08:00
wangzhijiang 745a8b81e3 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO 2022-10-27 11:27:30 +08:00
wangzhijiang b2100c360f 61842-待办中心已办/已发 排序按照截止时间倒序排列 2022-10-27 11:26:59 +08:00
zyx.net 55f74e8b64 1.收集清单柱状图,收集清单下拉框宽度修改
2.参数项收集清单填写人增加导入导出功能
2022-10-27 11:11:16 +08:00
zhn 99f733ec97 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-27 11:10:27 +08:00
zhn 6580ac32ac 月报填写不设置权限 2022-10-27 11:10:03 +08:00
sunFlower 54a63160b5 修改禅道已知bug 2022-10-27 11:09:33 +08:00
sunFlower 7a886825d2 修改禅道已知bug 2022-10-27 11:01:20 +08:00
zhn ddc97405cc 页眉添加期数 2022-10-27 10:57:00 +08:00
CD 835c005f6c 法规技术评估模块消息完毕 2022-10-27 10:30:23 +08:00
sunFlower e2385b900f 修改法规月报的字段名称 2022-10-27 10:14:41 +08:00
zhn 04e6792f0b 法规月报填写
1. 主页面去掉主要内容行
2. 新车型实施日期,在产车实施日期,改为 发布日期,实施日期
3. 数据字典对齐(中文)
2022-10-27 10:07:13 +08:00
sunFlower 78f7d3e008 修改禅道已知bug 2022-10-27 10:04:36 +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
高嵩 f9cc564ffc 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!210
2022-10-27 09:38:05 +08:00
zhn 103b287366 临时提交 2022-10-27 09:05:09 +08:00
CD 0a84706ece 编号标题修改 2022-10-26 19:47:56 +08:00
sunFlower e61dadc20f 修改禅道已知bug 2022-10-26 17:47:20 +08:00
CD 67072bc9d0 Merge remote-tracking branch 'origin/feature_dev_20221025_message' into feature_dev_20221025_message 2022-10-26 17:44:45 +08:00
CD 737305c626 法规技术评估消息(不包含定时任务) 2022-10-26 17:44:04 +08:00
sunFlower 54a7eff97c Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO 2022-10-26 17:43:18 +08:00
sunFlower 35e0310605 修改禅道已知bug 2022-10-26 17:41:28 +08:00
zhn dbd80a4cce 问题知识库转发推送--发送飞书消息 2022-10-26 17:19:32 +08:00
zhn 494f41bb4f 文档库推送--发送飞书消息 2022-10-26 17:09:33 +08:00
wangzhijiang 991b4ebec2 61701-待办中心-项目法规任务、法规评估任务,处理登录人待办标识。 2022-10-26 17:05:30 +08:00
zhn cf17a1a7a9 虚拟清单发布和撤回--发送飞书消息 2022-10-26 16:46:32 +08:00
wangzhijiang bf2b51820d 61777-法规技术评估列表查询权限完善。 2022-10-26 15:52:05 +08:00
sunFlower 385d9fc993 修改禅道已知bug 2022-10-26 15:48:26 +08:00
sunFlower 9f104c564a 修改禅道已知bug 2022-10-26 15:47:20 +08:00
zhn d15254b4d9 飞书消息--去掉英文下的横杠 2022-10-26 15:37:52 +08:00
zhn c763273622 订阅领域--新增文档发飞书消息 2022-10-26 15:31:12 +08:00
zhn 128ea9778c 订阅领域-编辑文档是发飞书消息 2022-10-26 15:14:24 +08:00
sunFlower 6fbee100fb 修改禅道已知bug 2022-10-26 15:14:14 +08:00
CD 483aac1bce Merge remote-tracking branch 'origin/feature_dev_20221025_message' into feature_dev_20221025_message 2022-10-26 15:11:54 +08:00