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

326 Commits (d6a122c3693f89b62bbcbc2da62381403d0909df)

Author SHA1 Message Date
dearlin ee5192518b 八项作业与部分bug 2024-03-01 09:05:45 +08:00
WenShiJun 48a21ed00d 客户管理后端功能优化 
新增地点管理后端功能
 2024-02-29 18:30:26 +08:00
zhangqihang 8dd9ff3390 修复bug 2024-02-29 15:43:39 +08:00
chenxinying f26dbe0980 吊装作业，断路作业，动土作业，盲板PC端 2024-02-29 08:43:27 +08:00
WenShiJun c12d2c7774 安全通知->功能优化 
运单登记后端功能
客户管理后端功能
 2024-02-28 19:16:25 +08:00
dearlin c70b1d6bf1 14132 这几种隐患来源的显示不正确 需要统一 2024-02-28 14:26:41 +08:00
zhangqihang 2c3cc96696 修复bug 2024-02-28 13:45:01 +08:00
dearlin f90c019094 解决了 Bug 打回并删除的数字没有减少 14193 2024-02-28 11:51:35 +08:00
fangjiakai 93ca8d2982 聚集告警人员列表 2024-02-28 10:44:54 +08:00
dearlin d97dbcb715 聚集告警记录 2024-02-28 09:57:18 +08:00
fangjiakai d1def6945d 企业报告 高危作业数据 2024-02-28 09:34:29 +08:00
fangjiakai d8b90b8533 验收通知 2024-02-28 09:33:54 +08:00
fangjiakai df15791ea4 验收通知 2024-02-28 09:30:23 +08:00
fangjiakai ece06080fc Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 09:08:56 +08:00
fangjiakai f7443a8406 增加气体检测打回通知 2024-02-28 09:08:43 +08:00
zhangqihang 4c65e0c6c3 修复bug 2024-02-28 09:01:16 +08:00
dearlin b16405202a 验收打回隐患报错 14308 2024-02-27 17:27:09 +08:00
chenxinying a6a19febf7 吊装作业，断路作业，动土作业，盲板 2024-02-27 14:31:38 +08:00
wangpeng fb3f754bcf Merge pull request 'dev' (#4) from integrated_whb/integrated_whb:dev into dev 
Reviewed-on: #4
 2024-02-27 14:19:06 +08:00
fangjiakai 5d8f3acda0 Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 10:30:28 +08:00
fangjiakai cb0819f3e3 修改分页总条数显示 2024-02-27 10:30:15 +08:00
zhangqihang 271431816e 修复bug 2024-02-27 08:47:05 +08:00
WenShiJun fb93851600 安全例会->列表，新增，删除，详情接口开发 2024-02-26 18:29:43 +08:00
dearlin 72495ef2ca 部门 单位对接 2024-02-26 17:46:09 +08:00
zhangyanli 813c74f097 bug修复:14263,14294 2024-02-26 16:32:14 +08:00
dearlin 516f34f769 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-02-26 15:38:25 +08:00
dearlin 465e8dc397 14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户 2024-02-26 15:38:06 +08:00
zhangqihang f16a09c4aa 修复bug 2024-02-26 15:32:23 +08:00
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
dearlin af92ca1ba7 人员定位中相关对接操作 2024-02-26 09:39:21 +08:00
WenShiJun ba988ffb42 安全通知模块->列表，新增，删除，详情接口开发 2024-02-23 19:04:20 +08:00
zhangqihang acb1c9a5a2 修复bug 2024-02-23 18:04:02 +08:00
zhangqihang 51d29c72ef 修复视频上传 2024-02-23 09:52:53 +08:00
zhangqihang f5579e9856 修复安全环保检查bug 2024-02-23 09:06:12 +08:00
fangjiakai 387a31b276 Merge remote-tracking branch 'origin/dev' into dev 2024-02-22 17:35:35 +08:00
fangjiakai 9d1bcaa909 环保检查隐患指派 2024-02-22 17:35:23 +08:00
fangjiakai e2045a7a9a 环保检查隐患指派 2024-02-22 17:33:39 +08:00
dearlin 7fcbffb803 摄像头定位接口 2024-02-22 17:31:28 +08:00
dearlin 0fbddd5f62 新加外来人员部门，外来人员并且禁止登录到系统提示账号密码不正确 2024-02-22 16:33:00 +08:00
dearlin 9b40b93f37 告警管理，地图设置，聚集管理Api完成 2024-02-22 16:04:48 +08:00
chenxinying cbad06c6dc 临时用电 2024-02-22 11:35:14 +08:00
wangpeng c5c765bee3 手机首页统计待验收条件修改 2024-02-22 10:06:21 +08:00
dearlin 34d95fcf18 人员卡管理 2024-02-22 09:19:36 +08:00
zhangqihang c4730709b2 修复bug 2024-02-22 08:42:40 +08:00
zhangyanli 5514125492 排查统计和隐患治理菜单bug修复 2024-02-21 16:13:31 +08:00
wangpeng a67934c55c 特种作业人员证件临期提醒（迁表） 
隐患统计增加隐患清单排查数据
 2024-02-21 11:44:21 +08:00
chenxinying ca5c1fb850 特种作业人员 2024-02-21 11:17:07 +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
wangpeng 24a7d01b8c app首页我的工作数据校准 2024-02-20 16:43:10 +08:00
fangjiakai bd4c1edabf 环保隐患指派 2024-02-20 16:37:59 +08:00
dearlin 19021b8999 安全例会 2024-02-20 16:10:49 +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 3bb24697d6 动火作业加入可跳过步骤 2024-02-20 10:57:03 +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 09a83d789e 安全例会 2024-02-06 15:40:01 +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 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 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
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 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
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
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
wangpeng 8471e3fbc0 合并隐患排查 2024-01-30 16:50:58 +08:00
dearlin 5e1f9ad7dc 电子围栏树结构适配 2024-01-30 16:38:12 +08:00
dearlin e358657730 电子围栏树结构适配 2024-01-30 16:33:59 +08:00
dearlin 8c70ca1a79 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 16:27:29 +08:00
dearlin 63ff90c79b 电子围栏树结构适配 2024-01-30 16:27:19 +08:00
zhangyanli 5ecf9c56c9 隐患排查接口 2024-01-30 16:00:22 +08:00
dearlin 6353550fbd 人员定位改id 2024-01-30 15:36:15 +08:00
dearlin fbb99198ca 电子围栏 2024-01-30 15:16:04 +08:00
fangjiakai bc49136400 八项作业地图统计 2024-01-30 10:38:22 +08:00
chenxinying 336ccfa0c5 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 08:54:20 +08:00
chenxinying 6a75293abd 动火作业安全措施添加图片 2024-01-30 08:54:02 +08:00
dearlin 0b707e9261 bi页人员定位，ai视频分析完成 2024-01-29 17:35:59 +08:00
dearlin 771d0f04e7 根据用户卡号查信息 2024-01-29 10:18:20 +08:00
dearlin c353987bd2 根据卡号查询人员信息 2024-01-29 09:08:29 +08:00
dearlin d6adfe9c42 根据卡号查询人员信息 2024-01-29 09:07:57 +08:00
dearlin 7d60a3c2cd 根据卡号查询人员信息 2024-01-29 09:07:29 +08:00
dearlin 99a4514737 ai bajing 2024-01-27 11:29:26 +08:00
dearlin 5032c3e5c1 ai报警，人员信息导入的时候卡号变成5位 2024-01-26 15:54:26 +08:00
fangjiakai bf34c02c3c Merge remote-tracking branch 'origin/dev' into dev 2024-01-26 08:18:11 +08:00
fangjiakai 026ee59679 修改签名错位的问题 2024-01-26 08:17:56 +08:00
fangjiakai 76733ecd7c 修改签名错位的问题 2024-01-25 18:43:37 +08:00