FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,773 Commits 3 Branches 0 Tags
dev_20231201_feizhi
Commit Graph
6773 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 29335c3506 Merge branch 'develop' into 'test' 
Develop

See merge request !114
 2021-09-01 08:23:43 +00:00
yanyizhou 1df56128e8 Merge remote-tracking branch 'origin/develop' into develop 2021-09-01 16:05:12 +08:00
yanyizhou ab4bc4f3a5 项目清单确认流程 更改多个项目或清单选择问题 2021-09-01 16:05:06 +08:00
shenyanpei e28621a77d 标准预警 2021-09-01 15:37:05 +08:00
shenyanpei c0a0c591ae 未符合项流程修改 2021-09-01 15:31:44 +08:00
yanyizhou 0f4c0c3fab 未符合项整改 历史数据 查看的模态框的宽度变窄 2021-09-01 14:23:43 +08:00
yanyizhou 359a5762bd Merge remote-tracking branch 'origin/develop' into develop 2021-09-01 10:31:35 +08:00
yanyizhou 8fb8546e18 标准入库流程--选择国内或者海外的 第一步和第四步的手动查找的文本状态回显不对，且把标准状态改成文本状态 2021-09-01 10:31:25 +08:00
yanyizhou af5c40f250 项目清单确认流程--第二步，添加页面的标准的实施日期和文本状态没回显 2021-09-01 10:30:55 +08:00
王夏晖 33fd2d7f32 Merge branch 'develop' into 'test' 
标准预警初步修改~

See merge request !113
 2021-09-01 01:11:39 +00:00
Mr.Z 52cfcdb6d4 标准预警初步修改~ 2021-08-31 16:42:52 +08:00
王夏晖 5bcb99828b Merge branch 'develop' into 'test' 
Develop

See merge request !112
 2021-08-31 08:23:14 +00:00
yanyizhou 510811ede8 项目清单确认流程修改（+） 2021-08-31 16:01:07 +08:00
yanyizhou b6812e7843 Merge remote-tracking branch 'origin/develop' into develop 2021-08-31 15:44:12 +08:00
yanyizhou 81dd2bf5fc 国内外标准法规--编辑页面的手动查找查找的标准的文本状态显示不对，且把标准状态改成文本状态 2021-08-31 15:43:54 +08:00
宋伟佳 d5cd0bec9e 项目清单确认流程开发完成 2021-08-31 15:26:20 +08:00
宋伟佳 7002d1cc5b 项目清单确认流程修改bug及修改 2021-08-31 15:18:03 +08:00
王夏晖 99e83526af Merge branch 'develop' into 'test' 
Develop

See merge request !111
 2021-08-31 01:06:25 +00:00
宋伟佳 b050ca4f4f Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 18:00:11 +08:00
宋伟佳 7a34acb06c 项目清单确认流程 2021-08-30 17:59:33 +08:00
zhutianqi cf0d87cad8 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 17:58:45 +08:00
zhutianqi bde3d83e69 commit 2021-08-30 17:58:34 +08:00
yanyizhou 2918c418a2 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 17:57:13 +08:00
yanyizhou 12371449b8 标准预警--加筛选条件 2021-08-30 17:56:59 +08:00
王夏晖 997dde4de9 Merge branch 'develop' into 'test' 
Develop

See merge request !110
 2021-08-30 09:44:44 +00:00
shenyanpei 9e729793e3 菜单配置 2021-08-30 16:48:21 +08:00
zhaokaiyao@91isoft.com a3bb271e87 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 16:37:21 +08:00
zhaokaiyao@91isoft.com e5b432cdb7 国外法规普通查询清空按钮 2021-08-30 16:36:52 +08:00
王夏晖 55ccd5183c Merge branch 'develop' into 'test' 
Develop

See merge request !109
 2021-08-30 07:45:37 +00:00
shenyanpei ebe387e932 角色配置修改菜单，车库按钮注释 2021-08-30 15:32:16 +08:00
yanyizhou 59171f9543 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 15:25:12 +08:00
yanyizhou 3b36ebdc79 标准合规评估结果--技术评估结果 查看里面的查询条件更改为标准号/标准名称和具体章条 2021-08-30 15:25:06 +08:00
zhutianqi a708438b6f commit 2021-08-30 13:56:40 +08:00
zhutianqi b6d2684516 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 13:32:30 +08:00
zhutianqi 5b179e16c4 commit 2021-08-30 13:32:17 +08:00
super_liu 040df77e78 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 12:12:27 +08:00
super_liu 3a2291bf8f feat: There is no way the 2021-08-30 12:11:55 +08:00
zhaokaiyao@91isoft.com 594a3bcfa3 Merge remote-tracking branch 'origin/develop' into develop 2021-08-30 10:52:04 +08:00
王夏晖 e25fd03d19 Merge branch 'develop' into 'test' 
标准征求意见流程历史数据页面展示

See merge request !108
 2021-08-30 01:08:03 +00:00
zhaokaiyao@91isoft.com 820b215771 国内外标准详情 分解单日期格式和清空 2021-08-29 19:16:04 +08:00
宋伟佳 f19f93d521 标准征求意见流程历史数据页面展示 2021-08-27 18:21:04 +08:00
王夏晖 e654ae1b1e Merge branch 'develop' into 'test' 
国外标准-getAreaList-FOREIGN_STAND

See merge request !107
 2021-08-27 08:34:55 +00:00
zhaokaiyao@91isoft.com a17c9dfc8d 国外标准-getAreaList-FOREIGN_STAND 2021-08-27 16:16:51 +08:00
王夏晖 d590867541 Merge branch 'develop' into 'test' 
Develop

See merge request !106
 2021-08-27 08:07:02 +00:00
zhaokaiyao@91isoft.com 246b5ecdaf Merge remote-tracking branch 'origin/develop' into develop 2021-08-27 16:06:06 +08:00
zhaokaiyao@91isoft.com d82917fb08 国内标准-getAreaList-INLAND_STAND 2021-08-27 16:05:59 +08:00
shenyanpei 84bb7c36ed 属性自定义 2021-08-27 16:04:10 +08:00
zhaokaiyao@91isoft.com e7d2f7e1d2 Merge remote-tracking branch 'origin/develop' into develop 2021-08-27 15:55:58 +08:00
super_liu 83f0c0ec83 feat: There is no way the 2021-08-27 15:31:26 +08:00
super_liu 9f325623fd Merge remote-tracking branch 'origin/develop' into develop 2021-08-27 15:07:13 +08:00