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
..
electricity-accept	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-acceptconfess	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-apply	特殊作业作业人显示	2024-03-01 17:53:14 +08:00
electricity-approve	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-audit	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-confess	从业人员管理	2024-03-22 15:08:55 +08:00
electricity-confirm	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-detail	特殊作业作业人显示	2024-03-01 17:53:14 +08:00
electricity-endwork	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-gas	临时用电	2024-02-20 10:36:03 +08:00
electricity-guardian	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-list	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-measures	特殊作业选择安全确实确认人	2024-02-29 11:22:06 +08:00
electricity-measures-confirm	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-startwork	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-user	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
electricity-workuser	临时用电和部分动土作业	2024-02-22 11:39:41 +08:00
home.vue	新增安全环保检查模块	2024-01-22 14:28:07 +08:00