kun
|
9ea6c11043
|
feat: 劳务实名制-人员管理新增
|
2023-05-31 19:34:47 +08:00 |
|
kun
|
b9539c2003
|
fix: BUG修改
|
2023-05-30 19:22:38 +08:00 |
|
kun
|
33ce3a4c48
|
fix: BUG修改
|
2023-05-29 20:55:24 +08:00 |
|
kun
|
eee0f82504
|
fix: BUG修改
|
2023-05-29 20:25:23 +08:00 |
|
kun
|
66d07e587e
|
fix: BUG修改
|
2023-05-29 19:35:15 +08:00 |
|
kun
|
328ba091d7
|
Merge branch 'yanyan_dev' into kun_dev
|
2023-05-29 18:58:32 +08:00 |
|
kun
|
7069e572d4
|
fix: BUG修改
|
2023-05-29 18:57:22 +08:00 |
|
kun
|
c9ff390443
|
fix: BUG修改
|
2023-05-29 18:45:28 +08:00 |
|
kun
|
2908677015
|
fix: BUG修改
|
2023-05-29 18:19:12 +08:00 |
|
严妍
|
6fb10632f6
|
feat: 修改地图弹窗样式
|
2023-05-29 14:37:48 +08:00 |
|
于晏彭
|
42444adfab
|
Merge branch 'zhipeng_dev' into shenzhen-dev
|
2023-05-26 11:23:39 +08:00 |
|
于晏彭
|
36744c2071
|
feat: 富文本和项目报监bug
|
2023-05-26 11:22:38 +08:00 |
|
于晏彭
|
b01803c5b2
|
feat: 账号密码
|
2023-05-25 17:46:14 +08:00 |
|
于晏彭
|
b28ba69f47
|
Merge branch 'zhipeng_dev' into shenzhen-dev
|
2023-05-25 17:45:16 +08:00 |
|
于晏彭
|
19fd88b4ab
|
feat: 部门管理增加状态查询，样式修改
|
2023-05-25 17:44:38 +08:00 |
|
于晏彭
|
cb3a4c81dc
|
Merge branch 'yanyan_dev' into shenzhen-dev
|
2023-05-25 11:31:37 +08:00 |
|
于晏彭
|
c35a9149ee
|
Merge branch 'zhipeng_dev' into shenzhen-dev
|
2023-05-25 11:26:06 +08:00 |
|
于晏彭
|
8e50228252
|
feat: 用户管理新增加必填
|
2023-05-25 11:24:25 +08:00 |
|
于晏彭
|
2ac55867fb
|
feat: Merge branch 'zhipeng_dev' into shenzhen-dev
|
2023-05-25 09:31:08 +08:00 |
|
于晏彭
|
6ae15e8667
|
feat: 样式修改和政务管理全选，加接口loading
|
2023-05-25 09:26:19 +08:00 |
|
严妍
|
1a24abca2d
|
Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/wisdomisitezwfront into yanyan_dev
|
2023-05-24 11:21:18 +08:00 |
|
严妍
|
533794e2b4
|
Merge branch 'zhipeng_dev' of http://139.9.66.234:18023/dhp/wisdomisitezwfront into yanyan_dev
|
2023-05-24 11:21:07 +08:00 |
|
Jane
|
0d2ba27351
|
Merge branch 'zhipeng_dev' into 'shenzhen-dev'
feat: 样式修复
See merge request !9
|
2023-05-23 17:50:28 +08:00 |
|
于晏彭
|
ddd33ae0c7
|
feat: 样式修复
|
2023-05-23 17:49:14 +08:00 |
|
Jane
|
29c0e5333e
|
Merge branch 'zhipeng_dev' into 'shenzhen-dev'
feat: 通知公告我已知晓优化
See merge request !8
|
2023-05-23 15:24:52 +08:00 |
|
于晏彭
|
a4a7565a2d
|
feat: 通知公告我已知晓优化
|
2023-05-23 15:23:39 +08:00 |
|
于晏彭
|
f41789e2b4
|
feat: 修复合并冲突带来的全局loading
|
2023-05-23 15:12:51 +08:00 |
|
Jane
|
a09461284e
|
Merge branch 'zhipeng_dev' into 'shenzhen-dev'
Zhipeng dev
See merge request !7
|
2023-05-23 14:58:43 +08:00 |
|
于晏彭
|
7be4d41df4
|
feat: 样式修改
|
2023-05-23 14:48:51 +08:00 |
|
于晏彭
|
d35d21eea2
|
feat: fixd loading
|
2023-05-23 10:53:24 +08:00 |
|
于晏彭
|
ce00eb8149
|
feat: 通知公告增加我已知晓，样式修改
|
2023-05-23 10:47:27 +08:00 |
|
于晏彭
|
dbae5764b5
|
feat: 样式修改
|
2023-05-23 09:21:07 +08:00 |
|
严妍
|
acf6ff80de
|
feat: 修改图片路径
|
2023-05-23 09:18:09 +08:00 |
|
于晏彭
|
f6657e0c6b
|
feat: 部门管理加状态查询和政策法规重置和取消按钮
|
2023-05-22 17:09:00 +08:00 |
|
Jane
|
987a279535
|
Merge branch 'yanyan_dev' into 'shenzhen-dev'
Yanyan dev
See merge request !5
|
2023-05-21 15:15:49 +08:00 |
|
于晏彭
|
8ab4dbff4b
|
fix: 合并冲突
|
2023-05-19 17:51:19 +08:00 |
|
Jane
|
a33e250ffa
|
Merge branch 'zhipeng_dev' into 'shenzhen-dev'
Zhipeng dev
See merge request !3
|
2023-05-19 17:19:13 +08:00 |
|
于晏彭
|
78048c98ef
|
feat: 通知公告+一些样式和需求变更修改已完成
|
2023-05-19 17:02:08 +08:00 |
|
严妍
|
b474419566
|
feat: 新增2D地图以及地图点位
|
2023-05-19 16:10:07 +08:00 |
|
严妍
|
728a3f0f24
|
feat: 新增2D地图，对接天气和时间
|
2023-05-16 16:24:57 +08:00 |
|
严妍
|
b62522da96
|
feat: 大屏
|
2023-05-13 18:44:53 +08:00 |
|
于晏彭
|
25a97fbb34
|
feat: 视频监控和ai预警模块已完成
|
2023-05-13 18:42:57 +08:00 |
|
严妍
|
8da74483b5
|
feat: 新增大屏
|
2023-05-12 10:04:12 +08:00 |
|
严妍
|
fc8b808ee6
|
Merge branch 'zhipeng_dev' of http://139.9.66.234:18023/dhp/wisdomisitezwfront into yanyan_dev
|
2023-05-04 11:16:35 +08:00 |
|
于晏彭
|
d0e023034b
|
feat: 扬尘管理和政策法规搞定
|
2023-05-04 09:25:35 +08:00 |
|
于晏彭
|
2aab9a8982
|
feat: ai预警和首页样式解决
|
2023-04-25 14:37:08 +08:00 |
|
于晏彭
|
97c68850b0
|
feat: ai预警完成+样式修复
|
2023-04-25 10:48:27 +08:00 |
|
于晏彭
|
a197bccfba
|
css文件
|
2023-04-07 17:09:02 +08:00 |
|
于晏彭
|
617c7c78a1
|
企业注册和项目注册 企业审批项目审批 报监记录 项目报监 工程审批
|
2023-04-07 17:06:54 +08:00 |
|
于晏彭
|
99fe791195
|
修改样式加审批
|
2023-03-27 14:17:30 +08:00 |
|