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
..
ai-call-the-police	初始化提交	2024-01-16 17:24:49 +08:00
blind-board	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
blindboard	从业人员管理	2024-03-22 15:08:55 +08:00
breakground	从业人员管理	2024-03-22 15:08:55 +08:00
check-record	隐患记录bug修复	2024-07-14 12:37:20 +08:00
commitment-company	初始化提交	2024-01-16 17:24:49 +08:00
commitment-team	初始化提交	2024-01-16 17:24:49 +08:00
commitment-workshop	初始化提交	2024-01-16 17:24:49 +08:00
confinedspace	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
cutroad	从业人员管理	2024-03-22 15:08:55 +08:00
dangerous_options	从业人员管理	2024-03-22 15:08:55 +08:00
driving-inspections	清单排查记录bug修复	2024-07-14 09:47:41 +08:00
electricity	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
equipment-overhaul	初始化提交	2024-01-16 17:24:49 +08:00
gas-detection	从业人员管理	2024-03-22 15:08:55 +08:00
hidden-danger-check-standard	隐患清单其他隐患的增加bug修复	2024-07-14 17:19:14 +08:00
hidden-danger-management	隐患记录bug修复	2024-07-14 12:37:20 +08:00
hidden-trouble-investigation/hidden-trouble-app	隐患检查内容回显	2024-07-14 15:51:10 +08:00
highwork	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
hoisting	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
hotwork	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
key-project-management	修复bug	2024-02-28 13:45:58 +08:00
limit-space	初始化提交	2024-01-16 17:24:49 +08:00
limit-space-affirm	从业人员管理	2024-03-22 15:08:55 +08:00
limit-space-approve	初始化提交	2024-01-16 17:24:49 +08:00
limit-space-check	从业人员管理	2024-03-22 15:08:55 +08:00
onlinexxks	清单排查记录bug修复	2024-07-14 09:47:41 +08:00
open-circuit	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
other-apps/videos	初始化提交	2024-01-16 17:24:49 +08:00
safety-environmental-inspection	Merge remote-tracking branch 'origin/master' into dev	2025-07-03 14:15:04 +08:00
safetymeeting	BUG优化	2024-07-11 18:33:16 +08:00
speEquip	从业人员管理	2024-03-22 15:08:55 +08:00
video/VideoManager	从业人员管理	2024-03-22 15:08:55 +08:00
commitment.vue	初始化提交	2024-01-16 17:24:49 +08:00
eight-assignments.vue	新增安全环保检查模块	2024-01-22 14:28:07 +08:00
hazardous_commitment.vue	初始化提交	2024-01-16 17:24:49 +08:00
home.vue	清单排查记录bug修复	2024-07-14 09:47:41 +08:00