Commit Graph
96 Commits
Author SHA1 Message Date
宋伟佳 448dab48dc 首页登录39后台 2021-06-16 13:39:28 +08:00
宋伟佳 9495265b47 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-15 18:00:44 +08:00
宋伟佳 b09acf446a commit 2021-06-15 18:00:38 +08:00
zhutianqi a6a14ae914 Merge remote-tracking branch 'origin/develop' into develop 2021-06-15 18:00:09 +08:00
zhutianqi 91a7fc2ce7 commit 2021-06-15 18:00:02 +08:00
youyuzihan 048e6b03e5 add:添加标准征求意见界面 2021-06-15 15:27:30 +08:00
youyuzihan a6fbd00ece add:添加标准调研流程界面 2021-06-15 14:57:34 +08:00
宋伟佳 0201ecde23 commit 2021-06-11 14:47:46 +08:00
宋伟佳 c202c38171 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-11 08:58:06 +08:00
宋伟佳 ae2c36b77a 海外标准 2021-06-10 18:03:17 +08:00
zhutianqi 46a58d88e9 Merge remote-tracking branch 'origin/develop' into develop 2021-06-10 18:01:28 +08:00
zhutianqi ec98e41298 commit 2021-06-10 18:01:21 +08:00
宋伟佳 16f2fd367d 海外标准法规 2021-06-10 11:24:19 +08:00
宋伟佳 75b7a8b696 海外标准 2021-06-10 10:44:13 +08:00
宋伟佳 9909b69cab Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-10 09:28:17 +08:00
宋伟佳 2ce8cc68d1 commit 2021-06-10 09:28:12 +08:00
zhutianqi fe0d77e31b Merge remote-tracking branch 'origin/develop' into develop 2021-06-09 17:58:11 +08:00
zhutianqi 98f888c251 commit 2021-06-09 17:57:44 +08:00
宋伟佳 7e3b7ee6e1 未符合项整改 2021-06-09 17:54:38 +08:00
宋伟佳 7bdf5f6b38 未符合项整改 2021-06-09 17:19:35 +08:00
宋伟佳 d07e1c15de Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-09 13:57:46 +08:00
宋伟佳 afd7d90ec2 标准预警 国内法规详情 2021-06-09 13:57:40 +08:00
zhutianqi ed6a3e2c1d Merge remote-tracking branch 'origin/develop' into develop 2021-06-08 17:57:53 +08:00
zhutianqi 45a9026b2e commit 2021-06-08 17:57:46 +08:00
宋伟佳 a1bf499605 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-08 10:07:27 +08:00
宋伟佳 5d6ab83c30 标准预警 2021-06-08 10:07:16 +08:00
zhutianqi f24cd9c23f Merge remote-tracking branch 'origin/develop' into develop 2021-06-07 18:00:59 +08:00
zhutianqi 580e33900b commit 2021-06-07 18:00:52 +08:00
宋伟佳 8bedbf1822 标准属性自定义 2021-06-07 10:25:08 +08:00
宋伟佳 5b2169ed24 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-04 18:02:55 +08:00
宋伟佳 4cbf301ebf 海外标准页面开发 2021-06-04 18:02:40 +08:00
zhutianqi de57b8d2ae Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/sysConfig/index.js
2021-06-04 18:02:14 +08:00
zhutianqi 7cc0300099 commit 2021-06-04 18:01:50 +08:00
宋伟佳 af2a58433d 放开海外标准和未符合项 2021-06-04 15:26:18 +08:00
宋伟佳 a96acfaa1c commit 2021-06-04 10:54:45 +08:00
宋伟佳 dfaa5ddf3e 合并冲突 2021-06-04 09:15:16 +08:00
宋伟佳 0b7920498e commit 2021-06-04 09:14:03 +08:00
zhutianqi a9da09f095 commit 2021-06-03 14:05:13 +08:00
youyuzihan 69176ebed0 update:修正一些bug 2021-06-03 10:35:15 +08:00
宋伟佳 fbf5ccaaae 征求意见详情 2021-06-03 09:28:12 +08:00
宋伟佳 7fe17881fd no message 2021-06-03 09:10:15 +08:00
宋伟佳 43900fcb6e 合并代码 2021-06-03 09:08:30 +08:00
宋伟佳 22ca4cac6d 征求意见 2021-06-03 09:03:49 +08:00
youyuzihan 83c12b74e7 update:保留侧边栏 2021-06-03 08:51:12 +08:00
youyuzihan 6202d04708 update:保留侧边栏 2021-06-03 00:07:26 +08:00
youyuzihan 59d9fc8c7d update:保留侧边栏 2021-06-02 23:42:06 +08:00
zhutianqi 00ad1e9b9b Merge remote-tracking branch 'origin/develop' into develop 2021-06-02 20:24:05 +08:00
zhutianqi a5b05a0e2a commit 2021-06-02 20:23:59 +08:00
宋伟佳 0141af3756 更改背景图片 2021-06-02 17:23:07 +08:00
宋伟佳 af43cda6bb 征求意见详情 2021-06-02 15:57:11 +08:00