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 |
|
chenxinying
|
564091e81d
|
临时用电
|
2024-02-20 10:36:03 +08:00 |
WenShiJun
|
eae8982e0e
|
新增安全环保检查模块
|
2024-01-22 14:28:07 +08:00 |
|
chenxinying
|
8558d6c0e8
|
删除原八项作业
|
2024-01-22 08:37:11 +08:00 |
 fangjiakai
|
ab09258858
|
初始化提交
|
2024-01-16 17:24:49 +08:00 |