diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
deleted file mode 100644
index 698eb5e..0000000
--- "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
+++ /dev/null
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
deleted file mode 100644
index 698eb5e..0000000
--- "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png" "b/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
deleted file mode 100644
index 092b230..0000000
--- "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
+++ /dev/null
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
deleted file mode 100644
index 698eb5e..0000000
--- "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png" "b/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
deleted file mode 100644
index 092b230..0000000
--- "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
+++ /dev/null
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index df89ab8..4f59f89 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -141,22 +141,22 @@
 <style>
 .warning-dialog {
   background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_一级.png");
+  background-image: url("@/assets/global_images/warningDialog_one.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   box-shadow: none;
 }
 
 .grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_二级.png");
+  background-image: url("@/assets/global_images/warningDialog_two.png");
 }
 
 .grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_三级.png");
+  background-image: url("@/assets/global_images/warningDialog_three.png");
 }
 
 .grade-other {
-  background-image: url("@/assets/global_images/warningDialog_其它.png");
+  background-image: url("@/assets/global_images/warningDialog_other.png");
 }
 </style>
 

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
deleted file mode 100644
index 698eb5e..0000000
--- "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png" "b/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
deleted file mode 100644
index 092b230..0000000
--- "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
+++ /dev/null
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index df89ab8..4f59f89 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -141,22 +141,22 @@
 <style>
 .warning-dialog {
   background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_一级.png");
+  background-image: url("@/assets/global_images/warningDialog_one.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   box-shadow: none;
 }
 
 .grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_二级.png");
+  background-image: url("@/assets/global_images/warningDialog_two.png");
 }
 
 .grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_三级.png");
+  background-image: url("@/assets/global_images/warningDialog_three.png");
 }
 
 .grade-other {
-  background-image: url("@/assets/global_images/warningDialog_其它.png");
+  background-image: url("@/assets/global_images/warningDialog_other.png");
 }
 </style>
 
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 3bead3b..2f804ea 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -267,7 +267,7 @@
       </el-button>
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
       <el-button
-        v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
+        v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending') && !info.confirmContent?.includes('完成')"
         type="primary" size="small" @click="pending"
       >
         挂起

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
deleted file mode 100644
index 698eb5e..0000000
--- "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png" "b/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
deleted file mode 100644
index 092b230..0000000
--- "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
+++ /dev/null
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index df89ab8..4f59f89 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -141,22 +141,22 @@
 <style>
 .warning-dialog {
   background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_一级.png");
+  background-image: url("@/assets/global_images/warningDialog_one.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   box-shadow: none;
 }
 
 .grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_二级.png");
+  background-image: url("@/assets/global_images/warningDialog_two.png");
 }
 
 .grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_三级.png");
+  background-image: url("@/assets/global_images/warningDialog_three.png");
 }
 
 .grade-other {
-  background-image: url("@/assets/global_images/warningDialog_其它.png");
+  background-image: url("@/assets/global_images/warningDialog_other.png");
 }
 </style>
 
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 3bead3b..2f804ea 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -267,7 +267,7 @@
       </el-button>
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
       <el-button
-        v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
+        v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending') && !info.confirmContent?.includes('完成')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 1c27f30..7e60256 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -12,6 +12,7 @@
   {
     name: '报警生成',
     procrssNames: ['未读', '已读'],
+    processCode: ['1'],
     icon0: '开始',
     icon1: '开始',
     active: 1,
@@ -19,6 +20,7 @@
   {
     name: '分公司调度中心',
     procrssNames: ['待现场确认'],
+    processCode: ['2', '4'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 2,
@@ -26,6 +28,7 @@
   {
     name: '确认人员',
     procrssNames: ['已确认'],
+    processCode: ['5'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 3,
@@ -33,6 +36,7 @@
   {
     name: '处置人员',
     procrssNames: ['待处置'],
+    processCode: ['6', '7'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 4,
@@ -40,6 +44,7 @@
   {
     name: '设备正常',
     procrssNames: ['已处置'],
+    processCode: ['8'],
     icon0: '设备-0',
     icon1: '设备-1',
     active: 5,
@@ -47,6 +52,7 @@
   {
     name: '结束',
     procrssNames: ['已处置'],
+    processCode: ['9'],
     icon0: '结束',
     icon1: '结束',
     active: 6,
@@ -57,15 +63,15 @@
 // 初始化对话框
 const loading = ref(true)
 const initDialog = (row: any) => {
+  console.log(row, 'row')
   dialogFormVisible.value = true
   loading.value = true
   processData.value = JSON.parse(JSON.stringify(initData))
-  console.log(processData.value, 'processData.value')
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
       const last = res.data[res.data.length - 1]
       // 挂起流程
-      if (last.process_name === '挂起') {
+      if (last.FLOW_STATUS === '3') {
         //  挂起
         processData.value.splice(1, 0, {
           name: '挂起',
@@ -94,20 +100,43 @@
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
-          const cindex = processData.value.findIndex((citem: any) => citem.procrssNames.includes(item.process_name))
-          processData.value[cindex].content = `
+          // console.log(item, 'item')
+          const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
+          // console.log(cindex, '123')
+          if (cindex !== -1) {
+            processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
+          }
         })
-        active.value = processData.value.findIndex((citem: any) => citem.procrssNames.includes(last.process_name)) + 1
-        const lastName = last.process_name
-        if (lastName === '已处置' && last.DESCN === '已修复') {
-          active.value = 6
-          processData.value[processData.value.length - 1].content = processData.value[processData.value.length - 2].content
+        console.log(processData.value, 'processData.value')
+        processData.value[0].content = `
+        <span>时间: ${row.alarmTime}</span></br>
+        <span>操作: 报警生成</span></br>
+        `
+        if (data.length < 4 && Number(data[data.length - 1].FLOW_STATUS) >= 7) {
+          processData.value = processData.value.filter((item: any) => item.name !== '处置人员')
+          const cindex = processData.value.findIndex((item: any) => item.name === '确认人员')
+          if (!processData.value[cindex].content) {
+            const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
+            processData.value[cindex].content = `
+                    <span>时间: ${data[index].APPROVAL_TIME}</span></br>
+        <span>人员: ${data[index].APPROVAL_PERSON}</span></br>
+        <span>操作: ${data[index].process_name}</span></br>
+        `
+          }
         }
+        active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
+        // console.log(active.value, 'active.value')
+        // const lastName = last.process_name
+        // if (lastName === '已处置' && last.DESCN === '已修复') {
+        //   active.value = 6
+        //   processData.value[processData.value.length - 1].content = processData.value[processData.value.length - 2].content
+        // }
       }
     }
     loading.value = false

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
deleted file mode 100644
index ee677f8..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\200\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
deleted file mode 100644
index f6ab028..0000000
--- "a/src/assets/global_images/warningDialog_\344\270\211\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png" "b/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
deleted file mode 100644
index 698eb5e..0000000
--- "a/src/assets/global_images/warningDialog_\344\272\214\347\272\247.png"
+++ /dev/null
Binary files differ
diff --git "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png" "b/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
deleted file mode 100644
index 092b230..0000000
--- "a/src/assets/global_images/warningDialog_\345\205\266\345\256\203.png"
+++ /dev/null
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index df89ab8..4f59f89 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -141,22 +141,22 @@
 <style>
 .warning-dialog {
   background-color: #0000;
-  background-image: url("@/assets/global_images/warningDialog_一级.png");
+  background-image: url("@/assets/global_images/warningDialog_one.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   box-shadow: none;
 }
 
 .grade-2 {
-  background-image: url("@/assets/global_images/warningDialog_二级.png");
+  background-image: url("@/assets/global_images/warningDialog_two.png");
 }
 
 .grade-3 {
-  background-image: url("@/assets/global_images/warningDialog_三级.png");
+  background-image: url("@/assets/global_images/warningDialog_three.png");
 }
 
 .grade-other {
-  background-image: url("@/assets/global_images/warningDialog_其它.png");
+  background-image: url("@/assets/global_images/warningDialog_other.png");
 }
 </style>
 
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 3bead3b..2f804ea 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -267,7 +267,7 @@
       </el-button>
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
       <el-button
-        v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending')"
+        v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/pending' : '/alarm/current/pending') && !info.confirmContent?.includes('完成')"
         type="primary" size="small" @click="pending"
       >
         挂起
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 1c27f30..7e60256 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -12,6 +12,7 @@
   {
     name: '报警生成',
     procrssNames: ['未读', '已读'],
+    processCode: ['1'],
     icon0: '开始',
     icon1: '开始',
     active: 1,
@@ -19,6 +20,7 @@
   {
     name: '分公司调度中心',
     procrssNames: ['待现场确认'],
+    processCode: ['2', '4'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 2,
@@ -26,6 +28,7 @@
   {
     name: '确认人员',
     procrssNames: ['已确认'],
+    processCode: ['5'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 3,
@@ -33,6 +36,7 @@
   {
     name: '处置人员',
     procrssNames: ['待处置'],
+    processCode: ['6', '7'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 4,
@@ -40,6 +44,7 @@
   {
     name: '设备正常',
     procrssNames: ['已处置'],
+    processCode: ['8'],
     icon0: '设备-0',
     icon1: '设备-1',
     active: 5,
@@ -47,6 +52,7 @@
   {
     name: '结束',
     procrssNames: ['已处置'],
+    processCode: ['9'],
     icon0: '结束',
     icon1: '结束',
     active: 6,
@@ -57,15 +63,15 @@
 // 初始化对话框
 const loading = ref(true)
 const initDialog = (row: any) => {
+  console.log(row, 'row')
   dialogFormVisible.value = true
   loading.value = true
   processData.value = JSON.parse(JSON.stringify(initData))
-  console.log(processData.value, 'processData.value')
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
       const last = res.data[res.data.length - 1]
       // 挂起流程
-      if (last.process_name === '挂起') {
+      if (last.FLOW_STATUS === '3') {
         //  挂起
         processData.value.splice(1, 0, {
           name: '挂起',
@@ -94,20 +100,43 @@
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
-          const cindex = processData.value.findIndex((citem: any) => citem.procrssNames.includes(item.process_name))
-          processData.value[cindex].content = `
+          // console.log(item, 'item')
+          const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
+          // console.log(cindex, '123')
+          if (cindex !== -1) {
+            processData.value[cindex].content = `
         <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].APPROVAL_PERSON}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
+          }
         })
-        active.value = processData.value.findIndex((citem: any) => citem.procrssNames.includes(last.process_name)) + 1
-        const lastName = last.process_name
-        if (lastName === '已处置' && last.DESCN === '已修复') {
-          active.value = 6
-          processData.value[processData.value.length - 1].content = processData.value[processData.value.length - 2].content
+        console.log(processData.value, 'processData.value')
+        processData.value[0].content = `
+        <span>时间: ${row.alarmTime}</span></br>
+        <span>操作: 报警生成</span></br>
+        `
+        if (data.length < 4 && Number(data[data.length - 1].FLOW_STATUS) >= 7) {
+          processData.value = processData.value.filter((item: any) => item.name !== '处置人员')
+          const cindex = processData.value.findIndex((item: any) => item.name === '确认人员')
+          if (!processData.value[cindex].content) {
+            const index = data.findIndex((item: any) => item.FLOW_STATUS === '7')
+            processData.value[cindex].content = `
+                    <span>时间: ${data[index].APPROVAL_TIME}</span></br>
+        <span>人员: ${data[index].APPROVAL_PERSON}</span></br>
+        <span>操作: ${data[index].process_name}</span></br>
+        `
+          }
         }
+        active.value = processData.value.findLastIndex((citem: any) => citem.content) + 1
+        // console.log(active.value, 'active.value')
+        // const lastName = last.process_name
+        // if (lastName === '已处置' && last.DESCN === '已修复') {
+        //   active.value = 6
+        //   processData.value[processData.value.length - 1].content = processData.value[processData.value.length - 2].content
+        // }
       }
     }
     loading.value = false
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index f4d4d38..d756fa4 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -23,9 +23,9 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
   { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '信号强度', value: 'strength', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
   { text: '采集时间', value: 'logtime', align: 'center' },
   { text: '上传时间', value: 'uptime', align: 'center' },
 ])