Commit Graph

157 Commits (39544b2aa3856c9d1fed1b437170153f4951bd3e)

Author SHA1 Message Date
wangpeng e00f386f42 风险管控排查问题修复 2024-02-19 23:28:44 +08:00
fangjiakai 2c5a77582c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	.gitignore
2024-02-19 16:10:23 +08:00
fangjiakai 4e856af6c3 git忽略文件 2024-02-19 16:10:11 +08:00
WenShiJun ea5511557e 首页安全环保检查模块优化 2024-02-19 12:05:08 +08:00
wangpeng f80b00bd8c Merge remote-tracking branch 'origin/dev' into dev 2024-02-19 09:59:43 +08:00
wangpeng 423685c8bc 风险管控排查问题修复 2024-02-19 09:59:38 +08:00
wangpeng 81e18d9fb5 风险管控排查问题修复 2024-02-19 09:58:30 +08:00
wangpeng 3984573dee 风险管控排查问题修复 2024-02-19 09:51:26 +08:00
WenShiJun 4e6a308437 数据暂存 2024-02-06 15:39:22 +08:00
WenShiJun 33c431d34f 安全环保检查模块优化0206 2024-02-06 15:38:56 +08:00
chenxinying 8a5a4b29f5 Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 15:37:22 +08:00
chenxinying c436c4ac5d 受限空间和高处作业意见改为必填,气体分析加分析地点,动火加安全副总审批 2024-02-05 15:37:11 +08:00
wangpeng a73f58891a 首页统计待排查页面跳转新增 2024-02-05 09:05:12 +08:00
zhangqihang 01a12469b4 重点工程 2024-02-03 18:00:44 +08:00
wangpeng 381de3b66d 隐患(已验收) 2024-02-03 16:18:00 +08:00
wangpeng 4bf6b7876d 隐患(待整改、超期、验收) 2024-02-03 15:36:05 +08:00
wangpeng 524097e365 隐患记录 2024-02-03 12:27:03 +08:00
wangpeng 9b12285d73 隐患清单检查+检查结果 2024-02-03 09:32:20 +08:00
chenxinying daca12f37c Merge remote-tracking branch 'origin/dev' into dev 2024-02-01 09:02:03 +08:00
chenxinying 79447571e8 受限空间和高处作业 2024-02-01 09:01:50 +08:00
dearlin 045294b52c Merge remote-tracking branch 'origin/dev' into dev 2024-01-31 17:21:05 +08:00
dearlin 552f5449ab 辨别部位里电子围栏名称字段修改 2024-01-31 17:20:58 +08:00
chenxinying a14c542742 电子围栏显示,多人签字更改 2024-01-31 15:14:01 +08:00
chenxinying 282c948a7d 动火作业 2024-01-26 11:03:47 +08:00
chenxinying b692cf9a6d Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 17:40:08 +08:00
chenxinying 7288ed869b 如果是多个安全措施确认人,某个人打回,则其他确认人不显示打回作业 2024-01-25 17:39:35 +08:00
dearlin 97a2372357 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 17:29:50 +08:00
dearlin ca7db13c77 手机端排查清单需在电子围栏中 2024-01-25 17:29:41 +08:00
fangjiakai 2a84c69ea0 动火添加绑定电子围栏 2024-01-25 15:59:40 +08:00
chenxinying 5e7217a392 八项作业动火作业签字显示完成,动火人及证书编号显示完成 2024-01-25 13:47:26 +08:00
fangjiakai 841fc02538 动火流程图 2024-01-25 13:36:15 +08:00
fangjiakai e5d97b6027 动火安全措施回显 2024-01-25 10:07:24 +08:00
fangjiakai d539e7d54c 动火详情组件 2024-01-25 08:32:09 +08:00
fangjiakai 63f2bbd9f9 Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 17:50:34 +08:00
fangjiakai c447d37a4e 动火列表状态 2024-01-24 17:50:25 +08:00
chenxinying c38168173e Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 17:27:58 +08:00
chenxinying 8ab22cc85c 八项作业特级,一级,二级动火流程打回 2024-01-24 17:27:42 +08:00
fangjiakai 81dcd9329a Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
2024-01-24 17:24:23 +08:00
fangjiakai 63b5d07ef6 动火安全措施回显 2024-01-24 17:23:22 +08:00
chenxinying b57bee505c 八项作业特级,一级,二级动火流程打回 2024-01-24 17:15:20 +08:00
fangjiakai 589716c05d 动火安全措施确认 2024-01-24 14:03:35 +08:00
chenxinying 9605a827e1 八项作业特级,一级,二级动火流程通过 2024-01-24 13:59:05 +08:00
chenxinying 8a57daafec 八项作业特级,一级,二级动火流程通过 2024-01-24 13:58:55 +08:00
LiuJiaNan 55cbea71d8 公共页面 2024-01-24 09:24:23 +08:00
LiuJiaNan b9e79b7a4f 公共页面 2024-01-24 09:23:55 +08:00
chenxinying 3bb1f384f6 八项作业特级动火list提交 2024-01-24 08:47:58 +08:00
fangjiakai 61c8715476 动火设置安全措施确认人 2024-01-23 14:03:07 +08:00
chenxinying cef4bc7d0d 八项作业动火监护人签字 2024-01-23 11:28:19 +08:00
chenxinying 8d588f6d08 八项作业安全措施确认人 2024-01-23 08:30:59 +08:00
chenxinying 9a00ecd8ed 八项作业气体检测分析 2024-01-22 17:29:29 +08:00