wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity
249 Commits
3 Branches
0 Tags
51 MiB
Commit Graph

174 Commits (918037d593e0350aa08ef4f8e505b2077d964e0d)

Author SHA1 Message Date
dearlin 918037d593 Merge remote-tracking branch 'origin/dev' into dev 2024-02-26 11:37:58 +08:00
dearlin 752b0e1300 允许进入部门，允许进入人员 2024-02-26 11:37:49 +08:00
zhangyanli 64b883b73f bug:14263修复 2024-02-26 11:19:25 +08:00
fangjiakai 6ce8b6669e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/mapApi/MapController.java
 2024-02-26 10:35:54 +08:00
fangjiakai 91ce11d64a 动火增加消息通知 2024-02-26 10:34:55 +08:00
zhangqihang acb1c9a5a2 修复bug 2024-02-23 18:04:02 +08:00
wangpeng 15c3d39b8b BI页统计数据校准 2024-02-23 10:08:25 +08:00
zhangqihang f5579e9856 修复安全环保检查bug 2024-02-23 09:06:12 +08:00
dearlin 0fbddd5f62 新加外来人员部门，外来人员并且禁止登录到系统提示账号密码不正确 2024-02-22 16:33:00 +08:00
chenxinying cbad06c6dc 临时用电 2024-02-22 11:35:14 +08:00
zhangqihang c4730709b2 修复bug 2024-02-22 08:42:40 +08:00
wangpeng 0daa256c35 Merge remote-tracking branch 'origin/dev' into dev 2024-02-21 21:11:45 +08:00
wangpeng 0f1b009c24 手机首页统计增加隐患排查数据情况 2024-02-21 21:11:35 +08:00
zhangyanli 4ac70c2d74 bug修复 2024-02-21 18:08:29 +08:00
wangpeng d086ad5dcc BI页面统计增加隐患排查数据情况 2024-02-21 17:20:55 +08:00
zhangyanli 5514125492 排查统计和隐患治理菜单bug修复 2024-02-21 16:13:31 +08:00
wangpeng eb44fe6dfe BI页面任务处理情况统计增加隐患排查数据情况 2024-02-21 15:27:54 +08:00
wangpeng 81053da3a3 统计分析增加隐患排查数据统计 2024-02-21 14:21:21 +08:00
wangpeng a67934c55c 特种作业人员证件临期提醒（迁表） 
隐患统计增加隐患清单排查数据
 2024-02-21 11:44:21 +08:00
chenxinying ca5c1fb850 特种作业人员 2024-02-21 11:17:07 +08:00
fangjiakai 29f9cbcfca 八项作业流程图 2024-02-21 10:47:59 +08:00
wangpeng d6bb1fd3fe 特种作业人员证件临期提醒 2024-02-21 08:41:57 +08:00
chenxinying 192810971f Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 16:49:47 +08:00
chenxinying 68796ab8b1 动火安全副总去掉 2024-02-20 16:49:40 +08:00
wangpeng 24a7d01b8c app首页我的工作数据校准 2024-02-20 16:43:10 +08:00
chenxinying 0d81a7688d Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 16:36:42 +08:00
chenxinying 4a303a04fd 动火安全副总去掉 2024-02-20 16:36:34 +08:00
zhangqihang fd2daa6f02 修复bug 2024-02-20 16:11:56 +08:00
dearlin 19021b8999 安全例会 2024-02-20 16:10:49 +08:00
wangpeng 7b0f0f2ea6 隐患清单排查漏传检查项目参数 2024-02-20 15:44:10 +08:00
zhangqihang 6b46ce0337 重点工程流程修复 2024-02-20 14:26:09 +08:00
fangjiakai 98103d92f3 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 14:17:32 +08:00
fangjiakai 9b0f6f5a7b 动火作业修改流程图查询 2024-02-20 12:04:06 +08:00
fangjiakai 3bb24697d6 动火作业加入可跳过步骤 2024-02-20 10:57:03 +08:00
chenxinying 8e15e0f60c Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 10:51:25 +08:00
chenxinying cdd1b1c79c 受限作业作业人 2024-02-20 10:51:19 +08:00
dearlin d911193e36 安全例会 2024-02-20 08:38:25 +08:00
zhangqihang 425f26928e 修复bug 2024-02-19 17:05:17 +08:00
WenShiJun d77838e897 安全环保检查相关bug优化 2024-02-19 12:07:37 +08:00
wangpeng 25a7c7973f 隐患排查异常修改 2024-02-19 08:58:17 +08:00
chenxinying 9b880a5521 Merge remote-tracking branch 'origin/dev' into dev 2024-02-06 15:41:24 +08:00
chenxinying ffe52a21c8 动火添加安全副总 2024-02-06 15:41:10 +08:00
dearlin 1aef642987 Merge remote-tracking branch 'origin/dev' into dev 2024-02-06 15:40:12 +08:00
dearlin 09a83d789e 安全例会 2024-02-06 15:40:01 +08:00
zhangyanli 86adfdbf18 bug修复 2024-02-06 14:27:57 +08:00
fangjiakai 57bcd4591c 动火作业加入可跳过步骤 2024-02-05 17:28:23 +08:00
zhangqihang 8061ea3e72 修改重点工程相关方短信发送 2024-02-05 14:59:25 +08:00
zhangyanli 2519724187 bug修复 2024-02-05 14:28:40 +08:00
fangjiakai 13474db93d Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 13:43:34 +08:00
fangjiakai 1716c4fa55 动火作业加入可跳过步骤 2024-02-05 13:43:21 +08:00