From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/specialWorkSystem/workFlow/approveRule/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/index.vue b/src/views/specialWorkSystem/workFlow/approveRule/index.vue
index 831170a..3f7f8b8 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/index.vue
+++ b/src/views/specialWorkSystem/workFlow/approveRule/index.vue
@@ -148,13 +148,13 @@
{ id: 8, name: '盲板抽堵作业' }
],
workLevelList: [
+ { id: 3, name: '特级动火作业' },
{ id: 1, name: '一级动火作业' },
{ id: 2, name: '二级动火作业' },
- { id: 3, name: '三级动火作业' },
+ { id: 7, name: '特级高处作业' },
{ id: 4, name: '一级高处作业' },
{ id: 5, name: '二级高处作业' },
{ id: 6, name: '三级高处作业' },
- { id: 7, name: '四级高处作业' },
{ id: 8, name: '一级吊装作业' },
{ id: 9, name: '二级吊装作业' },
{ id: 10, name: '三级吊装作业' },
--
Gitblit v1.9.2