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

59 Commits (7558066cb4206711397a060910a2db5d4eed7ea9)

Author SHA1 Message Date
chenxinying 8482fa7e79 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 16:56:10 +08:00
chenxinying c7e8305bb2 八项作业中作业人显示，吊装作业安全措施添加吨数 2024-03-01 16:55:50 +08:00
dearlin ee5192518b 八项作业与部分bug 2024-03-01 09:05:45 +08:00
chenxinying f26dbe0980 吊装作业，断路作业，动土作业，盲板PC端 2024-02-29 08:43:27 +08:00
dearlin f90c019094 解决了 Bug 打回并删除的数字没有减少 14193 2024-02-28 11:51:35 +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 f7443a8406 增加气体检测打回通知 2024-02-28 09:08:43 +08:00
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 3bb24697d6 动火作业加入可跳过步骤 2024-02-20 10:57:03 +08:00
chenxinying ffe52a21c8 动火添加安全副总 2024-02-06 15:41:10 +08:00
fangjiakai 978698312c 动火作业加入可跳过步骤 2024-02-05 17:08:39 +08:00
fangjiakai f275f5b3b2 动火作业加入可跳过步骤 2024-02-05 15:53:14 +08:00
fangjiakai dfae8753cc 动火作业加入可跳过步骤 2024-02-05 13:50:22 +08:00
fangjiakai 1716c4fa55 动火作业加入可跳过步骤 2024-02-05 13:43:21 +08:00
fangjiakai eea6621946 地图八项作业 2024-02-04 09:14:57 +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 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 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
fangjiakai 026ee59679 修改签名错位的问题 2024-01-26 08:17:56 +08:00
fangjiakai 76733ecd7c 修改签名错位的问题 2024-01-25 18:43:37 +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 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
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
fangjiakai 25d0947d7f 动火作业 service层方法 2024-01-24 09:59:54 +08:00
chenxinying 22dd31c65a 动火添加验收时间字段，更新作业开始时间，结束时间和验收时间 2024-01-24 09:25:29 +08:00
chenxinying 0650dffac0 动火下一步状态变更 2024-01-23 11:27:24 +08:00
fangjiakai 13e1b7442e 动火作业 2024-01-23 08:29:43 +08:00
fangjiakai 298b10c1de 动火作业 service层新增措施相关接口 2024-01-22 08:48:40 +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