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

57 Commits (268e1a3c4687e74e96e2237a81eb11e0481100f5)

Author SHA1 Message Date
chenxinying a6a19febf7 吊装作业，断路作业，动土作业，盲板 2024-02-27 14:31:38 +08:00
fangjiakai 91ce11d64a 动火增加消息通知 2024-02-26 10:34:55 +08:00
chenxinying cbad06c6dc 临时用电 2024-02-22 11:35:14 +08:00
fangjiakai 29f9cbcfca 八项作业流程图 2024-02-21 10:47:59 +08:00
chenxinying 68796ab8b1 动火安全副总去掉 2024-02-20 16:49:40 +08:00
chenxinying 4a303a04fd 动火安全副总去掉 2024-02-20 16:36:34 +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 cdd1b1c79c 受限作业作业人 2024-02-20 10:51:19 +08:00
chenxinying ffe52a21c8 动火添加安全副总 2024-02-06 15:41:10 +08:00
fangjiakai 57bcd4591c 动火作业加入可跳过步骤 2024-02-05 17:28:23 +08:00
fangjiakai 1716c4fa55 动火作业加入可跳过步骤 2024-02-05 13:43:21 +08:00
fangjiakai eea6621946 地图八项作业 2024-02-04 09:14:57 +08:00
dearlin 571bff720f 八项作业摄像头播放相关 2024-02-03 09:43:34 +08:00
chenxinying d86ed69320 八项作业高处添加位置，PC端显示 2024-02-01 14:46:17 +08:00
chenxinying a721c9ddcd 八项作业受限 2024-02-01 09:03:14 +08:00
chenxinying 94ac88f6fc Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 08:27:54 +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 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
chenxinying 3d57c00c43 八项作业统计数，以及关联作业票列表显示 2024-01-31 08:42:55 +08:00
fangjiakai bc49136400 八项作业地图统计 2024-01-30 10:38:22 +08:00
chenxinying 6a75293abd 动火作业安全措施添加图片 2024-01-30 08:54:02 +08:00
chenxinying 3403a1c0e8 动火作业 2024-01-26 11:02:46 +08:00
chenxinying 56d43e7ebd 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 2024-01-25 17:40:55 +08:00
fangjiakai 563a0cbd3a 动火作业添加电子围栏 2024-01-25 16:00:38 +08:00
chenxinying 8ef4b2977e 风险辨识结果和关联其他特殊作业及安全作业票编号显示 2024-01-25 14:05:39 +08:00
chenxinying cc33e51b0c 八项作业动火作业签字显示完成，动火人及证书编号显示完成 2024-01-25 13:47:52 +08:00
fangjiakai a4b7ff0a63 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 13:38:45 +08:00
fangjiakai b1db99346e 动火作业流程图 2024-01-25 13:38:16 +08:00
chenxinying 3eb09bdcc8 动火气体分析不显示验收归档的作业票 2024-01-24 17:28:46 +08:00
fangjiakai f43b48d546 动火安全措施确认 2024-01-24 17:20:55 +08:00
fangjiakai eb6ea22dfd Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 14:04:57 +08:00
fangjiakai e3d2091070 动火安全措施确认 2024-01-24 14:04:39 +08:00
chenxinying 44d1708a79 动火验收，查询时，显示签字信息 2024-01-24 14:00:24 +08:00
chenxinying abeb80f88d 动火更新作业开始时间，结束时间和验收时间 2024-01-24 09:34:59 +08:00
chenxinying 22dd31c65a 动火添加验收时间字段，更新作业开始时间，结束时间和验收时间 2024-01-24 09:25:29 +08:00
fangjiakai 13e1b7442e 动火作业 2024-01-23 08:29:43 +08:00
chenxinying 3507bf61a9 动火添加作业开始和作业结束 2024-01-22 14:05:11 +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
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