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 |
 wangpeng
|
9e7b0b5420
|
从业人员管理
|
2024-03-22 15:08:55 +08:00 |
|
chenxinying
|
d5129650de
|
特殊作业作业人显示
|
2024-03-01 17:53:14 +08:00 |
|
chenxinying
|
dc33f7c9e1
|
特殊作业选择安全确实确认人
|
2024-02-29 11:22:06 +08:00 |
|
chenxinying
|
e8e46bd741
|
动土作业，盲板作业，断路作业
|
2024-02-27 14:35:43 +08:00 |
|
chenxinying
|
c3cb02c9c4
|
临时用电和部分动土作业
|
2024-02-22 11:39:41 +08:00 |
 fangjiakai
|
35bcb78b59
|
八项作业流程图
|
2024-02-21 10:49:36 +08:00 |
|
chenxinying
|
ae27ff75bc
|
受限空间和高处作业，动火作业验收视频
|
2024-02-20 10:25:50 +08:00 |
|
chenxinying
|
c436c4ac5d
|
受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批
|
2024-02-05 15:37:11 +08:00 |
|
chenxinying
|
79447571e8
|
受限空间和高处作业
|
2024-02-01 09:01:50 +08:00 |