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 |
zhangqihang
|
426c561104
|
修复bug
|
2024-02-28 13:45:58 +08:00 |
|
zhangqihang
|
3b7499eb40
|
修复bug
|
2024-02-28 09:02:47 +08:00 |
 fangjiakai
|
7d50f2c207
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pages/application/eight-assignments.vue
|
2024-02-27 14:15:30 +08:00 |
|
fangjiakai
|
b1265f9468
|
更换高危作业顺序
|
2024-02-27 14:14:33 +08:00 |
|
zhangqihang
|
8a9707e924
|
修复bug
|
2024-02-23 09:07:59 +08:00 |
|
zhangqihang
|
266c860d7d
|
安全环保检查bug修复
|
2024-02-22 11:36:18 +08:00 |
 dearlin
|
e67e07c510
|
新增安全例会功能补充
|
2024-02-20 15:44:11 +08:00 |
|
fangjiakai
|
bfdb4ab1ec
|
删除隐患确认人
|
2024-02-20 11:40:42 +08:00 |
WenShiJun
|
4e6a308437
|
数据暂存
|
2024-02-06 15:39:22 +08:00 |
|
WenShiJun
|
33c431d34f
|
安全环保检查模块优化0206
|
2024-02-06 15:38:56 +08:00 |
|
WenShiJun
|
eae8982e0e
|
新增安全环保检查模块
|
2024-01-22 14:28:07 +08:00 |