Commit Graph

110 Commits (5ef28f2aa2200c8156dabe54d5279e435b73d9d9)

Author SHA1 Message Date
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 546f680ff1 八项作业高处作业流程 2024-01-31 11:28:04 +08:00
fangjiakai 1f8a3f7f6f 动火作业设置作业位置坐标 2024-01-31 10:22:34 +08:00
chenxinying 6cfc72304b 八项作业添加监控 2024-01-31 09:56:39 +08:00
chenxinying ee7ecdaa0a 八项作业受限空间流程 2024-01-31 08:44:48 +08:00
chenxinying 1e2bbfa4be 八项作业受限空间台账 2024-01-31 08:43:55 +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 e358657730 电子围栏树结构适配 2024-01-30 16:33:59 +08:00
zhangyanli 5ecf9c56c9 隐患排查接口 2024-01-30 16:00:22 +08:00
dearlin fbb99198ca 电子围栏 2024-01-30 15:16:04 +08:00
fangjiakai bc49136400 八项作业地图统计 2024-01-30 10:38:22 +08:00
dearlin 0b707e9261 bi页人员定位,ai视频分析完成 2024-01-29 17:35:59 +08:00
dearlin 7d60a3c2cd 根据卡号查询人员信息 2024-01-29 09:07:29 +08:00
dearlin 5032c3e5c1 ai报警,人员信息导入的时候卡号变成5位 2024-01-26 15:54:26 +08:00
zhangqihang 7ef83c4290 重点工程(不包括AI报警和视频监控) 2024-01-25 18:04:53 +08:00
fangjiakai 563a0cbd3a 动火作业添加电子围栏 2024-01-25 16:00:38 +08:00
dearlin 84b0151796 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:20:40 +08:00
dearlin 8187112f9a 绑定人员定位卡号 2024-01-25 14:20:05 +08:00
chenxinying 8ef4b2977e 风险辨识结果和关联其他特殊作业及安全作业票编号显示 2024-01-25 14:05:39 +08:00
chenxinying cc33e51b0c 八项作业动火作业签字显示完成,动火人及证书编号显示完成 2024-01-25 13:47:52 +08:00
fangjiakai b1db99346e 动火作业流程图 2024-01-25 13:38:16 +08:00
fangjiakai 4c9801eacf Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
2024-01-24 17:21:54 +08:00
fangjiakai f43b48d546 动火安全措施确认 2024-01-24 17:20:55 +08:00
chenxinying 0a64479a7d 动火合并打回与保存功能 2024-01-24 17:14:19 +08:00
wangpeng 9d93529c50 权限路由 2024-01-24 11:39:18 +08:00
fangjiakai c120c0b55b Merge remote-tracking branch 'origin/dev' into dev 2024-01-23 08:30:03 +08:00
fangjiakai 13e1b7442e 动火作业 2024-01-23 08:29:43 +08:00
WenShiJun f628f098b3 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev
# Conflicts:
#	src/main/java/com/zcloud/service/system/DepartmentService.java
2024-01-22 14:17:42 +08:00
WenShiJun 5c15b857f3 新增安全、环保检查管理模块 2024-01-22 14:15:49 +08:00
fangjiakai 1df78fdd26 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
2024-01-22 08:47:56 +08:00
fangjiakai d578f2d083 动火作业 2024-01-22 08:45:31 +08:00
xiepeng e892e0c892 动火作业 获取所有措施 获取需要签字的措施 获取所有签字完成的措施 2024-01-19 14:36:54 +08:00
xiepeng 238023b118 动火作业 补充 取消,下一步,验收归档 2024-01-19 11:30:03 +08:00
fangjiakai 8c5051aaaf Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/service/eightwork/HotworkService.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
2024-01-19 10:26:55 +08:00
fangjiakai d4e586d700 动火作业 service层方法 2024-01-19 10:23:06 +08:00
xiepeng 5d35ba69d8 动火作业 根据Id查询
八项作业保存删除图片
2024-01-19 09:23:41 +08:00
chenxinying 2f1ef51627 动火气体检测分析的创建 2024-01-18 16:43:05 +08:00
fangjiakai fb0f7cf1fe 动火作业 2024-01-18 08:55:39 +08:00
chenxinying dd05b7d11d bus_hotwork_sign的mapper创建 2024-01-17 15:06:25 +08:00
chenxinying ebf1d6d6a0 BUS_EIGHTWORK_TASK的mapper创建 2024-01-17 14:19:50 +08:00
chenxinying da1dfc7f22 BUS_EIGHTWORK_TASK_FLOW的mapper创建 2024-01-17 14:16:56 +08:00
chenxinying 2d56101774 BUS_EIGHTWORK_FLOW_LOG的mapper创建 2024-01-17 14:08:59 +08:00
fangjiakai c3a95c61c0 动火作业 2024-01-17 13:41:44 +08:00
chenxinying 20fdf49bbc 八项作业删除 2024-01-17 10:43:13 +08:00
chenxinying eda0a53e19 八项作业作废时,监控删除,视频监控列表 2024-01-16 15:14:42 +08:00
chenxinying 09f069e1ac 八项作业添加监控 2024-01-11 16:58:12 +08:00
chenxinying 9c86394e0b 企业人员定位系统参数表 2024-01-10 17:37:12 +08:00
fangjiakai da7145a1a1 整合other mq 2024-01-05 10:06:26 +08:00
fangjiakai c40f40d58d 整合other mq 2024-01-05 09:57:31 +08:00
fangjiakai 0afe99435e 整合other mq 2024-01-05 08:51:44 +08:00
fangjiakai 9c60c0103a 整合education 2024-01-04 10:07:06 +08:00
fangjiakai 3486386421 整合prevention 2024-01-04 09:07:20 +08:00
fangjiakai 024ff844db 整合prevention Mapper 2024-01-03 16:36:04 +08:00
fangjiakai ae68bbf464 整合system 2024-01-03 11:04:18 +08:00
fangjiakai af5e6c28e8 整合home 2024-01-03 09:48:43 +08:00