diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ 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
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ 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
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ 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
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ 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
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two1.png b/src/assets/global_images/warningDialog_two1.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two1.png
Binary files differ

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two1.png b/src/assets/global_images/warningDialog_two1.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two1.png
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 4f59f89..1d81519 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,17 +59,99 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="400px"
+    width="550px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
+    <div class="title">
+      {{ info.alarmType }}
+    </div>
     <div class="container-dialog">
-      <div class="content">
-        <div class="name">
-          报警类型:
-        </div>
-        <div class="value">
+      <el-row :gutter="24" style="margin-top: 30px;">
+        <el-col :span="5">
+          报警类型
+        </el-col>
+        <el-col :span="7">
           {{ info.alarmType }}
+        </el-col>
+        <el-col :span="5">
+          设备类型
+        </el-col>
+        <el-col :span="7">
+          {{ info.typeName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          闸井位号
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagNumber }}
+        </el-col>
+        <el-col :span="5">
+          闸井名称
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警等级
+        </el-col>
+        <el-col :span="7">
+          {{ info.alarmLevel }}
+        </el-col>
+        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+          报警值
+        </el-col>
+        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+          {{ info.value }}
+          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警时间
+        </el-col>
+        <el-col :span="19">
+          {{ info.alarmTime }}
+        </el-col>
+      </el-row>
+      <!-- <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            报警类型:
+          </div>
+          <div class="value">
+            {{ info.alarmType }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            设备类型:
+          </div>
+          <div class="value">
+            {{ info.typeName }}
+          </div>
+        </div>
+      </div>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            闸井位号:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            闸井名称:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
         </div>
       </div>
       <div class="content">
@@ -82,22 +164,6 @@
       </div>
       <div class="content">
         <div class="name">
-          设备类型:
-        </div>
-        <div class="value">
-          {{ info.typeName }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          安装位号:
-        </div>
-        <div class="value">
-          {{ info.tagNumber }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
           报警值:
         </div>
         <div class="value">
@@ -112,17 +178,17 @@
         <div class="value">
           {{ info.alarmTime }}
         </div>
-      </div>
+      </div> -->
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
           查看
         </div>
-        <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
+        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
           关闭声音
         </div>
-        <div class="btn" @click="close">
+        <div class="btn info" @click="close">
           关闭
         </div>
         <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
@@ -161,15 +227,24 @@
 </style>
 
 <style lang="scss" scoped>
+.title {
+  position: absolute;
+  font-size: 22px;
+  font-weight: 700;
+  color: #fff;
+  top: 8px;
+  left: 75px;
+}
+
 .container-dialog {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   margin-top: 10px;
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
   font-size: 18px;
-  font-weight: 700;
+  font-weight: 600;
 
   .content {
     display: flex;
@@ -184,8 +259,10 @@
 .dialog-footer {
   width: 100%;
   display: flex;
-  justify-content: center;
+  justify-content: space-evenly;
   margin-bottom: 10px;
+  margin-top: 25px;
+  padding: 0 40px;
 
   .btn {
     width: 24%;
@@ -200,5 +277,40 @@
       color: rgb(115 184 240);
     }
   }
+
+  .primary {
+    background-color: #dc0000;
+    border-radius: 6px;
+    border-color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
+
+  .normal {
+    background-color: #fff;
+    border-color: #dc0000;
+    border-radius: 6px;
+    color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #dc0000;
+    }
+  }
+
+  .info {
+    background-color: #999;
+    border-radius: 6px;
+    border-color: #999;
+    color: #fff;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
 }
 </style>

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two1.png b/src/assets/global_images/warningDialog_two1.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two1.png
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 4f59f89..1d81519 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,17 +59,99 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="400px"
+    width="550px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
+    <div class="title">
+      {{ info.alarmType }}
+    </div>
     <div class="container-dialog">
-      <div class="content">
-        <div class="name">
-          报警类型:
-        </div>
-        <div class="value">
+      <el-row :gutter="24" style="margin-top: 30px;">
+        <el-col :span="5">
+          报警类型
+        </el-col>
+        <el-col :span="7">
           {{ info.alarmType }}
+        </el-col>
+        <el-col :span="5">
+          设备类型
+        </el-col>
+        <el-col :span="7">
+          {{ info.typeName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          闸井位号
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagNumber }}
+        </el-col>
+        <el-col :span="5">
+          闸井名称
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警等级
+        </el-col>
+        <el-col :span="7">
+          {{ info.alarmLevel }}
+        </el-col>
+        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+          报警值
+        </el-col>
+        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+          {{ info.value }}
+          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警时间
+        </el-col>
+        <el-col :span="19">
+          {{ info.alarmTime }}
+        </el-col>
+      </el-row>
+      <!-- <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            报警类型:
+          </div>
+          <div class="value">
+            {{ info.alarmType }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            设备类型:
+          </div>
+          <div class="value">
+            {{ info.typeName }}
+          </div>
+        </div>
+      </div>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            闸井位号:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            闸井名称:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
         </div>
       </div>
       <div class="content">
@@ -82,22 +164,6 @@
       </div>
       <div class="content">
         <div class="name">
-          设备类型:
-        </div>
-        <div class="value">
-          {{ info.typeName }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          安装位号:
-        </div>
-        <div class="value">
-          {{ info.tagNumber }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
           报警值:
         </div>
         <div class="value">
@@ -112,17 +178,17 @@
         <div class="value">
           {{ info.alarmTime }}
         </div>
-      </div>
+      </div> -->
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
           查看
         </div>
-        <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
+        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
           关闭声音
         </div>
-        <div class="btn" @click="close">
+        <div class="btn info" @click="close">
           关闭
         </div>
         <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
@@ -161,15 +227,24 @@
 </style>
 
 <style lang="scss" scoped>
+.title {
+  position: absolute;
+  font-size: 22px;
+  font-weight: 700;
+  color: #fff;
+  top: 8px;
+  left: 75px;
+}
+
 .container-dialog {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   margin-top: 10px;
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
   font-size: 18px;
-  font-weight: 700;
+  font-weight: 600;
 
   .content {
     display: flex;
@@ -184,8 +259,10 @@
 .dialog-footer {
   width: 100%;
   display: flex;
-  justify-content: center;
+  justify-content: space-evenly;
   margin-bottom: 10px;
+  margin-top: 25px;
+  padding: 0 40px;
 
   .btn {
     width: 24%;
@@ -200,5 +277,40 @@
       color: rgb(115 184 240);
     }
   }
+
+  .primary {
+    background-color: #dc0000;
+    border-radius: 6px;
+    border-color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
+
+  .normal {
+    background-color: #fff;
+    border-color: #dc0000;
+    border-radius: 6px;
+    color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #dc0000;
+    }
+  }
+
+  .info {
+    background-color: #999;
+    border-radius: 6px;
+    border-color: #999;
+    color: #fff;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
 }
 </style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 422df87..9ed553f 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -73,11 +73,25 @@
     localStorage.setItem('eventAudio', 'pause')
   }
 }
+const dialogRef = ref()
 const pause = () => {
   proxy.pauseAudio()
   localStorage.setItem('eventAudio', 'pause')
+  // const row = {
+  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+  //     isSound: '1', // 报警音效，1:开，0:关
+  //     isSend: '1', // 报警推送，1:开，0:关
+  //     isText: '1', // 报警短息，1:开，0:关
+  //     alarmType: '浓度超限',
+  //     tagNumber: 'NX5702',
+  //     alarmTime: '2024-09-09',
+  //     value: '20',
+  //     typeName: '燃气智能终端',
+  //     alarmLevel: '一级',
+  //   }
+  //   dialogRef.value.initDialog(row)
 }
-const dialogRef = ref()
+
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -89,6 +103,19 @@
       alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
+    // const row = {
+    //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+    //   isSound: '1', // 报警音效，1:开，0:关
+    //   isSend: '1', // 报警推送，1:开，0:关
+    //   isText: '1', // 报警短息，1:开，0:关
+    //   alarmType: '浓度超限',
+    //   tagNumber: 'NX5702',
+    //   alarmTime: '2024-09-09',
+    //   value: '20',
+    //   typeName: '燃气智能终端',
+    //   alarmLevel: '一级',
+    // }
+    // dialogRef.value.initDialog(row)
     loading.value = false
     play()
   }).catch(() => {

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two1.png b/src/assets/global_images/warningDialog_two1.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two1.png
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 4f59f89..1d81519 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,17 +59,99 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="400px"
+    width="550px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
+    <div class="title">
+      {{ info.alarmType }}
+    </div>
     <div class="container-dialog">
-      <div class="content">
-        <div class="name">
-          报警类型:
-        </div>
-        <div class="value">
+      <el-row :gutter="24" style="margin-top: 30px;">
+        <el-col :span="5">
+          报警类型
+        </el-col>
+        <el-col :span="7">
           {{ info.alarmType }}
+        </el-col>
+        <el-col :span="5">
+          设备类型
+        </el-col>
+        <el-col :span="7">
+          {{ info.typeName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          闸井位号
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagNumber }}
+        </el-col>
+        <el-col :span="5">
+          闸井名称
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警等级
+        </el-col>
+        <el-col :span="7">
+          {{ info.alarmLevel }}
+        </el-col>
+        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+          报警值
+        </el-col>
+        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+          {{ info.value }}
+          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警时间
+        </el-col>
+        <el-col :span="19">
+          {{ info.alarmTime }}
+        </el-col>
+      </el-row>
+      <!-- <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            报警类型:
+          </div>
+          <div class="value">
+            {{ info.alarmType }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            设备类型:
+          </div>
+          <div class="value">
+            {{ info.typeName }}
+          </div>
+        </div>
+      </div>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            闸井位号:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            闸井名称:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
         </div>
       </div>
       <div class="content">
@@ -82,22 +164,6 @@
       </div>
       <div class="content">
         <div class="name">
-          设备类型:
-        </div>
-        <div class="value">
-          {{ info.typeName }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          安装位号:
-        </div>
-        <div class="value">
-          {{ info.tagNumber }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
           报警值:
         </div>
         <div class="value">
@@ -112,17 +178,17 @@
         <div class="value">
           {{ info.alarmTime }}
         </div>
-      </div>
+      </div> -->
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
           查看
         </div>
-        <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
+        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
           关闭声音
         </div>
-        <div class="btn" @click="close">
+        <div class="btn info" @click="close">
           关闭
         </div>
         <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
@@ -161,15 +227,24 @@
 </style>
 
 <style lang="scss" scoped>
+.title {
+  position: absolute;
+  font-size: 22px;
+  font-weight: 700;
+  color: #fff;
+  top: 8px;
+  left: 75px;
+}
+
 .container-dialog {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   margin-top: 10px;
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
   font-size: 18px;
-  font-weight: 700;
+  font-weight: 600;
 
   .content {
     display: flex;
@@ -184,8 +259,10 @@
 .dialog-footer {
   width: 100%;
   display: flex;
-  justify-content: center;
+  justify-content: space-evenly;
   margin-bottom: 10px;
+  margin-top: 25px;
+  padding: 0 40px;
 
   .btn {
     width: 24%;
@@ -200,5 +277,40 @@
       color: rgb(115 184 240);
     }
   }
+
+  .primary {
+    background-color: #dc0000;
+    border-radius: 6px;
+    border-color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
+
+  .normal {
+    background-color: #fff;
+    border-color: #dc0000;
+    border-radius: 6px;
+    color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #dc0000;
+    }
+  }
+
+  .info {
+    background-color: #999;
+    border-radius: 6px;
+    border-color: #999;
+    color: #fff;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
 }
 </style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 422df87..9ed553f 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -73,11 +73,25 @@
     localStorage.setItem('eventAudio', 'pause')
   }
 }
+const dialogRef = ref()
 const pause = () => {
   proxy.pauseAudio()
   localStorage.setItem('eventAudio', 'pause')
+  // const row = {
+  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+  //     isSound: '1', // 报警音效，1:开，0:关
+  //     isSend: '1', // 报警推送，1:开，0:关
+  //     isText: '1', // 报警短息，1:开，0:关
+  //     alarmType: '浓度超限',
+  //     tagNumber: 'NX5702',
+  //     alarmTime: '2024-09-09',
+  //     value: '20',
+  //     typeName: '燃气智能终端',
+  //     alarmLevel: '一级',
+  //   }
+  //   dialogRef.value.initDialog(row)
 }
-const dialogRef = ref()
+
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -89,6 +103,19 @@
       alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
+    // const row = {
+    //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+    //   isSound: '1', // 报警音效，1:开，0:关
+    //   isSend: '1', // 报警推送，1:开，0:关
+    //   isText: '1', // 报警短息，1:开，0:关
+    //   alarmType: '浓度超限',
+    //   tagNumber: 'NX5702',
+    //   alarmTime: '2024-09-09',
+    //   value: '20',
+    //   typeName: '燃气智能终端',
+    //   alarmLevel: '一级',
+    // }
+    // dialogRef.value.initDialog(row)
     loading.value = false
     play()
   }).catch(() => {
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 6c337c4..d8347c2 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -17,7 +17,7 @@
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
-  { text: '报警推送', value: 'isSendName', align: 'center' },
+  // { text: '报警推送', value: 'isSendName', align: 'center' },
   // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two1.png b/src/assets/global_images/warningDialog_two1.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two1.png
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 4f59f89..1d81519 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,17 +59,99 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="400px"
+    width="550px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
+    <div class="title">
+      {{ info.alarmType }}
+    </div>
     <div class="container-dialog">
-      <div class="content">
-        <div class="name">
-          报警类型:
-        </div>
-        <div class="value">
+      <el-row :gutter="24" style="margin-top: 30px;">
+        <el-col :span="5">
+          报警类型
+        </el-col>
+        <el-col :span="7">
           {{ info.alarmType }}
+        </el-col>
+        <el-col :span="5">
+          设备类型
+        </el-col>
+        <el-col :span="7">
+          {{ info.typeName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          闸井位号
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagNumber }}
+        </el-col>
+        <el-col :span="5">
+          闸井名称
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警等级
+        </el-col>
+        <el-col :span="7">
+          {{ info.alarmLevel }}
+        </el-col>
+        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+          报警值
+        </el-col>
+        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+          {{ info.value }}
+          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警时间
+        </el-col>
+        <el-col :span="19">
+          {{ info.alarmTime }}
+        </el-col>
+      </el-row>
+      <!-- <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            报警类型:
+          </div>
+          <div class="value">
+            {{ info.alarmType }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            设备类型:
+          </div>
+          <div class="value">
+            {{ info.typeName }}
+          </div>
+        </div>
+      </div>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            闸井位号:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            闸井名称:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
         </div>
       </div>
       <div class="content">
@@ -82,22 +164,6 @@
       </div>
       <div class="content">
         <div class="name">
-          设备类型:
-        </div>
-        <div class="value">
-          {{ info.typeName }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          安装位号:
-        </div>
-        <div class="value">
-          {{ info.tagNumber }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
           报警值:
         </div>
         <div class="value">
@@ -112,17 +178,17 @@
         <div class="value">
           {{ info.alarmTime }}
         </div>
-      </div>
+      </div> -->
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
           查看
         </div>
-        <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
+        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
           关闭声音
         </div>
-        <div class="btn" @click="close">
+        <div class="btn info" @click="close">
           关闭
         </div>
         <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
@@ -161,15 +227,24 @@
 </style>
 
 <style lang="scss" scoped>
+.title {
+  position: absolute;
+  font-size: 22px;
+  font-weight: 700;
+  color: #fff;
+  top: 8px;
+  left: 75px;
+}
+
 .container-dialog {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   margin-top: 10px;
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
   font-size: 18px;
-  font-weight: 700;
+  font-weight: 600;
 
   .content {
     display: flex;
@@ -184,8 +259,10 @@
 .dialog-footer {
   width: 100%;
   display: flex;
-  justify-content: center;
+  justify-content: space-evenly;
   margin-bottom: 10px;
+  margin-top: 25px;
+  padding: 0 40px;
 
   .btn {
     width: 24%;
@@ -200,5 +277,40 @@
       color: rgb(115 184 240);
     }
   }
+
+  .primary {
+    background-color: #dc0000;
+    border-radius: 6px;
+    border-color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
+
+  .normal {
+    background-color: #fff;
+    border-color: #dc0000;
+    border-radius: 6px;
+    color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #dc0000;
+    }
+  }
+
+  .info {
+    background-color: #999;
+    border-radius: 6px;
+    border-color: #999;
+    color: #fff;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
 }
 </style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 422df87..9ed553f 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -73,11 +73,25 @@
     localStorage.setItem('eventAudio', 'pause')
   }
 }
+const dialogRef = ref()
 const pause = () => {
   proxy.pauseAudio()
   localStorage.setItem('eventAudio', 'pause')
+  // const row = {
+  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+  //     isSound: '1', // 报警音效，1:开，0:关
+  //     isSend: '1', // 报警推送，1:开，0:关
+  //     isText: '1', // 报警短息，1:开，0:关
+  //     alarmType: '浓度超限',
+  //     tagNumber: 'NX5702',
+  //     alarmTime: '2024-09-09',
+  //     value: '20',
+  //     typeName: '燃气智能终端',
+  //     alarmLevel: '一级',
+  //   }
+  //   dialogRef.value.initDialog(row)
 }
-const dialogRef = ref()
+
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -89,6 +103,19 @@
       alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
+    // const row = {
+    //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+    //   isSound: '1', // 报警音效，1:开，0:关
+    //   isSend: '1', // 报警推送，1:开，0:关
+    //   isText: '1', // 报警短息，1:开，0:关
+    //   alarmType: '浓度超限',
+    //   tagNumber: 'NX5702',
+    //   alarmTime: '2024-09-09',
+    //   value: '20',
+    //   typeName: '燃气智能终端',
+    //   alarmLevel: '一级',
+    // }
+    // dialogRef.value.initDialog(row)
     loading.value = false
     play()
   }).catch(() => {
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 6c337c4..d8347c2 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -17,7 +17,7 @@
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
-  { text: '报警推送', value: 'isSendName', align: 'center' },
+  // { text: '报警推送', value: 'isSendName', align: 'center' },
   // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 757a42c..0f25edf 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -163,11 +163,11 @@
             <el-switch v-model="dataForm.isSound" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+      <!-- <el-col :span="12">
           <el-form-item label="报警推送" prop="isSend">
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />

diff --git a/src/assets/global_images/warningDialog_one.png b/src/assets/global_images/warningDialog_one.png
index ee677f8..deae026 100644
--- a/src/assets/global_images/warningDialog_one.png
+++ b/src/assets/global_images/warningDialog_one.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_one1.png b/src/assets/global_images/warningDialog_one1.png
new file mode 100644
index 0000000..ee677f8
--- /dev/null
+++ b/src/assets/global_images/warningDialog_one1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other.png b/src/assets/global_images/warningDialog_other.png
index 092b230..deae026 100644
--- a/src/assets/global_images/warningDialog_other.png
+++ b/src/assets/global_images/warningDialog_other.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_other1.png b/src/assets/global_images/warningDialog_other1.png
new file mode 100644
index 0000000..092b230
--- /dev/null
+++ b/src/assets/global_images/warningDialog_other1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three.png b/src/assets/global_images/warningDialog_three.png
index f6ab028..deae026 100644
--- a/src/assets/global_images/warningDialog_three.png
+++ b/src/assets/global_images/warningDialog_three.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_three1.png b/src/assets/global_images/warningDialog_three1.png
new file mode 100644
index 0000000..f6ab028
--- /dev/null
+++ b/src/assets/global_images/warningDialog_three1.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two.png b/src/assets/global_images/warningDialog_two.png
index 698eb5e..deae026 100644
--- a/src/assets/global_images/warningDialog_two.png
+++ b/src/assets/global_images/warningDialog_two.png
Binary files differ
diff --git a/src/assets/global_images/warningDialog_two1.png b/src/assets/global_images/warningDialog_two1.png
new file mode 100644
index 0000000..698eb5e
--- /dev/null
+++ b/src/assets/global_images/warningDialog_two1.png
Binary files differ
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 4f59f89..1d81519 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,17 +59,99 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="400px"
+    width="550px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
+    <div class="title">
+      {{ info.alarmType }}
+    </div>
     <div class="container-dialog">
-      <div class="content">
-        <div class="name">
-          报警类型:
-        </div>
-        <div class="value">
+      <el-row :gutter="24" style="margin-top: 30px;">
+        <el-col :span="5">
+          报警类型
+        </el-col>
+        <el-col :span="7">
           {{ info.alarmType }}
+        </el-col>
+        <el-col :span="5">
+          设备类型
+        </el-col>
+        <el-col :span="7">
+          {{ info.typeName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          闸井位号
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagNumber }}
+        </el-col>
+        <el-col :span="5">
+          闸井名称
+        </el-col>
+        <el-col :span="7">
+          {{ info.tagName }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警等级
+        </el-col>
+        <el-col :span="7">
+          {{ info.alarmLevel }}
+        </el-col>
+        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+          报警值
+        </el-col>
+        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+          {{ info.value }}
+          {{ info.typeName.includes('燃气') ? '%vol' : '' }}
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin-top: 15px;">
+        <el-col :span="5">
+          报警时间
+        </el-col>
+        <el-col :span="19">
+          {{ info.alarmTime }}
+        </el-col>
+      </el-row>
+      <!-- <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            报警类型:
+          </div>
+          <div class="value">
+            {{ info.alarmType }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            设备类型:
+          </div>
+          <div class="value">
+            {{ info.typeName }}
+          </div>
+        </div>
+      </div>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="content">
+          <div class="name">
+            闸井位号:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
+        </div>
+        <div class="content">
+          <div class="name">
+            闸井名称:
+          </div>
+          <div class="value">
+            {{ info.tagNumber }}
+          </div>
         </div>
       </div>
       <div class="content">
@@ -82,22 +164,6 @@
       </div>
       <div class="content">
         <div class="name">
-          设备类型:
-        </div>
-        <div class="value">
-          {{ info.typeName }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
-          安装位号:
-        </div>
-        <div class="value">
-          {{ info.tagNumber }}
-        </div>
-      </div>
-      <div class="content">
-        <div class="name">
           报警值:
         </div>
         <div class="value">
@@ -112,17 +178,17 @@
         <div class="value">
           {{ info.alarmTime }}
         </div>
-      </div>
+      </div> -->
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <div v-if="proxy.hasPerm('/alarm/current')" class="btn" @click="detail">
+        <div v-if="proxy.hasPerm('/alarm/current')" class="btn primary" @click="detail">
           查看
         </div>
-        <div v-if="info.isSound === '1'" class="btn" @click="closeSound">
+        <div v-if="info.isSound === '1'" class="btn normal" @click="closeSound">
           关闭声音
         </div>
-        <div class="btn" @click="close">
+        <div class="btn info" @click="close">
           关闭
         </div>
         <!-- <el-button :loading="btnLoading" type="primary" @click="saveData">
@@ -161,15 +227,24 @@
 </style>
 
 <style lang="scss" scoped>
+.title {
+  position: absolute;
+  font-size: 22px;
+  font-weight: 700;
+  color: #fff;
+  top: 8px;
+  left: 75px;
+}
+
 .container-dialog {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   margin-top: 10px;
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
   font-size: 18px;
-  font-weight: 700;
+  font-weight: 600;
 
   .content {
     display: flex;
@@ -184,8 +259,10 @@
 .dialog-footer {
   width: 100%;
   display: flex;
-  justify-content: center;
+  justify-content: space-evenly;
   margin-bottom: 10px;
+  margin-top: 25px;
+  padding: 0 40px;
 
   .btn {
     width: 24%;
@@ -200,5 +277,40 @@
       color: rgb(115 184 240);
     }
   }
+
+  .primary {
+    background-color: #dc0000;
+    border-radius: 6px;
+    border-color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
+
+  .normal {
+    background-color: #fff;
+    border-color: #dc0000;
+    border-radius: 6px;
+    color: #dc0000;
+
+    &:hover {
+      cursor: pointer;
+      color: #dc0000;
+    }
+  }
+
+  .info {
+    background-color: #999;
+    border-radius: 6px;
+    border-color: #999;
+    color: #fff;
+
+    &:hover {
+      cursor: pointer;
+      color: #fff;
+    }
+  }
 }
 </style>
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 422df87..9ed553f 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -73,11 +73,25 @@
     localStorage.setItem('eventAudio', 'pause')
   }
 }
+const dialogRef = ref()
 const pause = () => {
   proxy.pauseAudio()
   localStorage.setItem('eventAudio', 'pause')
+  // const row = {
+  //     alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+  //     isSound: '1', // 报警音效，1:开，0:关
+  //     isSend: '1', // 报警推送，1:开，0:关
+  //     isText: '1', // 报警短息，1:开，0:关
+  //     alarmType: '浓度超限',
+  //     tagNumber: 'NX5702',
+  //     alarmTime: '2024-09-09',
+  //     value: '20',
+  //     typeName: '燃气智能终端',
+  //     alarmLevel: '一级',
+  //   }
+  //   dialogRef.value.initDialog(row)
 }
-const dialogRef = ref()
+
 const fetchData = (isLoading = false) => {
   loading.value = true
   if (isLoading) {
@@ -89,6 +103,19 @@
       alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
+    // const row = {
+    //   alarmNoteMethod: '1', // 消息提醒 1:弹窗，2:消息提醒
+    //   isSound: '1', // 报警音效，1:开，0:关
+    //   isSend: '1', // 报警推送，1:开，0:关
+    //   isText: '1', // 报警短息，1:开，0:关
+    //   alarmType: '浓度超限',
+    //   tagNumber: 'NX5702',
+    //   alarmTime: '2024-09-09',
+    //   value: '20',
+    //   typeName: '燃气智能终端',
+    //   alarmLevel: '一级',
+    // }
+    // dialogRef.value.initDialog(row)
     loading.value = false
     play()
   }).catch(() => {
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 6c337c4..d8347c2 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -17,7 +17,7 @@
   { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center' },
   { text: '报警音效', value: 'isSoundName', align: 'center' },
-  { text: '报警推送', value: 'isSendName', align: 'center' },
+  // { text: '报警推送', value: 'isSendName', align: 'center' },
   // { text: '报警短信', value: 'isTextName', align: 'center' },
 ])
 const loadingTable = ref(true)
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 757a42c..0f25edf 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -163,11 +163,11 @@
             <el-switch v-model="dataForm.isSound" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+      <!-- <el-col :span="12">
           <el-form-item label="报警推送" prop="isSend">
             <el-switch v-model="dataForm.isSend" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="12">
           <el-form-item label="报警短信" prop="isText">
             <el-switch v-model="dataForm.isText" size="large" active-text="开" inactive-text="关" active-value="1" inactive-value="0" />
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 288d83a..c44d4da 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="RuleAlarmManage">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import alarmType from './components/alarmTypeList.vue'
 import alarmLevel from './components/alarmLevelList.vue'
 import editDialog from './components/editDialog.vue'
@@ -32,7 +33,7 @@
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
   { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
-  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
+  { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -62,6 +63,7 @@
       alarmLevelName: alarmLevelList.value[alarmLevelList.value.findIndex(citem => item.alarmLevelId === citem.id)].name || '',
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
+      ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
     }))
     total.value = res.data.total
     loadingTable.value = false