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

265 Commits (93ca8d298245002effb945273e4a013429e1414c)

Author SHA1 Message Date
fangjiakai 29f9cbcfca 八项作业流程图 2024-02-21 10:47:59 +08:00
dearlin 089969712d 地图上报警信息 2024-02-21 09:04:50 +08:00
wangpeng d6bb1fd3fe 特种作业人员证件临期提醒 2024-02-21 08:41:57 +08:00
fangjiakai 488ed3f01e 修改分页总条数显示 2024-02-20 17:58:13 +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
fangjiakai cfa5416c1b Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 16:38:10 +08:00
fangjiakai bd4c1edabf 环保隐患指派 2024-02-20 16:37:59 +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 e4e6942264 隐患排查异常修改 2024-02-19 10:06:02 +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
wangpeng ba9618f0a2 路由菜单按权限加载 2024-02-06 10:54:53 +08:00
wangpeng 3a0afb43ef Merge remote-tracking branch 'origin/dev' into dev 2024-02-06 10:50:53 +08:00
wangpeng 27d2f26bfc 路由菜单按权限加载 2024-02-06 10:50:43 +08:00
fangjiakai 57bcd4591c 动火作业加入可跳过步骤 2024-02-05 17:28:23 +08:00
fangjiakai 226bdcf489 Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 17:08:52 +08:00
fangjiakai 978698312c 动火作业加入可跳过步骤 2024-02-05 17:08:39 +08:00
zhangyanli 9c4bca3c20 bug修复 2024-02-05 16:19:41 +08:00
fangjiakai ac4bb34820 Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 15:53:27 +08:00
fangjiakai f275f5b3b2 动火作业加入可跳过步骤 2024-02-05 15:53:14 +08:00
zhangqihang 8061ea3e72 修改重点工程相关方短信发送 2024-02-05 14:59:25 +08:00
zhangyanli 2519724187 bug修复 2024-02-05 14:28:40 +08:00
fangjiakai dfae8753cc 动火作业加入可跳过步骤 2024-02-05 13:50:22 +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
dearlin e0530e207c 根据清单类型查询 2024-02-05 11:49:07 +08:00
wangpeng 48c8f5de9b app首页隐患统计 2024-02-05 09:02:31 +08:00
zhangyanli 88efa3f0ea 多余代码删除 2024-02-04 17:37:52 +08:00
zhangyanli 1825eba1b7 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 17:05:06 +08:00
zhangyanli 4f9ca7c9c9 隐患排查添加导入 2024-02-04 17:04:34 +08:00
chenxinying 945b07d7fd Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 17:04:30 +08:00
chenxinying d409db84a2 受限空间台账 2024-02-04 17:03:58 +08:00
chenxinying 0064748958 排查计划 2024-02-04 17:03:34 +08:00
dearlin 741d2f1077 补录 2024-02-04 16:54:30 +08:00
chenxinying 614f0b6293 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 11:09:26 +08:00
fangjiakai 2d1952b93f Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:15:09 +08:00
fangjiakai eea6621946 地图八项作业 2024-02-04 09:14:57 +08:00
chenxinying a7fe385c5f Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:13:32 +08:00
zhangyanli 79b19f4fa3 隐患排查接口0204 2024-02-04 09:13:09 +08:00
chenxinying 7f9f82e81f Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:10:24 +08:00
zhangyanli 69ba309b4e 隐患排查接口 2024-02-04 09:09:25 +08:00
dearlin c886521b5b 清单检查情况完善隐患排查清单 2024-02-04 08:51:48 +08:00
zhangqihang 05927c3048 重点工程 2024-02-03 17:53:40 +08:00
chenxinying a8e8b96764 刪除清單管理隱患排查清單 2024-02-03 17:03:29 +08:00
wangpeng 48c9cda9a6 Merge remote-tracking branch 'origin/dev' into dev 2024-02-03 15:37:44 +08:00
wangpeng 463f0acd9d 手机隐患处理 2024-02-03 15:37:35 +08:00
chenxinying e103c37e86 Merge remote-tracking branch 'origin/dev' into dev 2024-02-03 14:05:40 +08:00
chenxinying 42096f595f 刪除清單管理隱患排查清單 2024-02-03 14:05:34 +08:00
wangpeng fe25bccc73 手机隐患检查记录 2024-02-03 12:05:21 +08:00
dearlin 6af31be56c bi页统计数值默认0，ai视频分所有摄像头扎点 2024-02-03 11:37:28 +08:00
dearlin 571bff720f 八项作业摄像头播放相关 2024-02-03 09:43:34 +08:00
wangpeng c6c76886d7 手机隐患清单检查记录 2024-02-01 22:37:47 +08:00
wangpeng 3c6e5fb59d 手机隐患清单排查 2024-02-01 17:07:32 +08:00
wangpeng cd97e0916a 手机隐患清单排查 2024-02-01 16:46:11 +08:00
wangpeng 77e8562313 BUS_HIDDENDANGERCHECKSTANDARD_HIDDENEXAMINE和 
BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN_USER后台初始化
 2024-02-01 15:05:18 +08:00
chenxinying d30cfe3624 受限空间台账PC端 2024-02-01 15:02:35 +08:00
chenxinying 2a7cc91b09 Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 14:47:21 +08:00
chenxinying d86ed69320 八项作业高处添加位置，PC端显示 2024-02-01 14:46:17 +08:00
wangpeng 7735a53bc6 更新CustomItemMapper的listAll 2024-02-01 10:43:52 +08:00
chenxinying 862461a376 Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 09:03:33 +08:00
chenxinying a721c9ddcd 八项作业受限 2024-02-01 09:03:14 +08:00
zhangyanli 9a81906a53 隐患排查接口240201 2024-02-01 08:37:20 +08:00
chenxinying 94ac88f6fc Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 08:27:54 +08:00
dearlin 4c9eb58c46 辨别部位里电子围栏名称字段修改 2024-01-31 17:20:15 +08:00
wangpeng e2429d5464 隐患检查隐患 2024-01-31 16:55:54 +08:00
wangpeng be0e9caa41 隐患检查隐患 2024-01-31 16:53:07 +08:00
wangpeng 8de91d0ca9 检查明细 2024-01-31 15:15:23 +08:00
zhangyanli 0602963d2f 隐患排查接口 2024-01-31 11:59:44 +08:00
chenxinying b5403d30bd 八项作业受限和动火验收或打回删除已绑定监控 2024-01-31 11:28:49 +08:00
chenxinying 546f680ff1 八项作业高处作业流程 2024-01-31 11:28:04 +08:00
fangjiakai 1f8a3f7f6f 动火作业设置作业位置坐标 2024-01-31 10:22:34 +08:00
fangjiakai e7e3ed29e9 作业位置字段 2024-01-31 10:17:48 +08:00
chenxinying 51bdfa2d51 Merge remote-tracking branch 'origin/dev' into dev 2024-01-31 09:58:01 +08:00
chenxinying 6cfc72304b 八项作业添加监控 2024-01-31 09:56:39 +08:00
dearlin f2e0039ce8 ai报警作业票号码 2024-01-31 09:15:43 +08:00
chenxinying ee7ecdaa0a 八项作业受限空间流程 2024-01-31 08:44:48 +08:00
chenxinying 1e2bbfa4be 八项作业受限空间台账 2024-01-31 08:43:55 +08:00
chenxinying 3d57c00c43 八项作业统计数，以及关联作业票列表显示 2024-01-31 08:42:55 +08:00
chenxinying e5d7efd3e1 Merge remote-tracking branch 'origin/dev' into dev 2024-01-31 08:40:39 +08:00
chenxinying 77e20d7586 八项作业电子围栏第一级不让选择，返前端disabled 2024-01-31 08:40:31 +08:00
wangpeng 53ce6b2698 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 16:51:55 +08:00