10396 ba72e50421 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # .gitignore # common/tool.js # package-lock.json # pages.json # pages/application/blind-board/home.vue # pages/application/confinedspace/home.vue # pages/application/eight-assignments.vue # pages/application/electricity/home.vue # pages/application/highwork/home.vue # pages/application/hoisting/home.vue # pages/application/hotwork/home.vue # pages/application/open-circuit/home.vue # pages/application/safety-environmental-inspection/apply/detail-plead.vue # pages/application/safety-environmental-inspection/apply/detail.vue # pages/application/safety-environmental-inspection/apply/flowChart.vue # pages/application/safety-environmental-inspection/apply/list.vue # pages/application/safety-environmental-inspection/apply/show.vue # pages/application/safety-environmental-inspection/archive/detail-check.vue # pages/application/safety-environmental-inspection/archive/detail-hidden.vue # pages/application/safety-environmental-inspection/archive/detail.vue # pages/application/safety-environmental-inspection/archive/list-hidden.vue # pages/application/safety-environmental-inspection/defense-record/list.vue # pages/application/safety-environmental-inspection/inspected/detail.vue # pages/application/safety-environmental-inspection/inspector/detail.vue # pages/application/safety-environmental-inspection/rectification/detail.vue # pages/basics/home.vue # pages/login/home.vue		2025-07-03 14:15:04 +08:00
..
hotwork-accept	受限空间和高处作业，动火作业验收视频	2024-02-20 10:25:50 +08:00
hotwork-acceptconfess	电子围栏显示，多人签字更改	2024-01-31 15:14:01 +08:00
hotwork-apply	特殊作业作业人显示	2024-03-01 17:53:14 +08:00
hotwork-approve	电子围栏显示，多人签字更改	2024-01-31 15:14:01 +08:00
hotwork-audit	受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批	2024-02-05 15:37:11 +08:00
hotwork-confess	从业人员管理	2024-03-22 15:08:55 +08:00
hotwork-confirm	受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批	2024-02-05 15:37:11 +08:00
hotwork-detail	特殊作业作业人显示	2024-03-01 17:53:14 +08:00
hotwork-endwork	电子围栏显示，多人签字更改	2024-01-31 15:14:01 +08:00
hotwork-gas	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
hotwork-guardian	电子围栏显示，多人签字更改	2024-01-31 15:14:01 +08:00
hotwork-leader	受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批	2024-02-05 15:37:11 +08:00
hotwork-list	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
hotwork-measures	特殊作业选择安全确实确认人	2024-02-29 11:22:06 +08:00
hotwork-measures-confirm	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
hotwork-monitor	受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批	2024-02-05 15:37:11 +08:00
hotwork-startwork	电子围栏显示，多人签字更改	2024-01-31 15:14:01 +08:00
home.vue	Merge branch 'master' of http://47.92.113.182:3000/integrated_whb/UniApp_integrated_whb	2024-01-22 14:31:48 +08:00