diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index c44d4da..e62199c 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,13 +25,13 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
   { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
@@ -64,6 +64,7 @@
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
       ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
+      alarmNote: item.alarmNote.split(','),
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -290,8 +291,18 @@
         <template #isCustom="{ scope, column }">
           <!-- 报警提示方式 -->
           <span v-if="column.text === '报警提示方式'">
-            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
-            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+            <!-- <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag> -->
+            <el-tag
+              v-for="item in scope.row.alarmNote"
+              v-show="item"
+              :key="item"
+              :type="item === '消息提醒' ? 'primary'
+                : item === '弹窗提醒' ? 'danger'
+                  : item === '报警音效' ? 'success' : 'info'
+              "
+              style="margin-left: 5px;"
+            >{{ item }}</el-tag>
           </span>
           <!-- 报警提示方式 -->
           <span v-if="column.text === '状态'">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index c44d4da..e62199c 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,13 +25,13 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
   { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
@@ -64,6 +64,7 @@
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
       ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
+      alarmNote: item.alarmNote.split(','),
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -290,8 +291,18 @@
         <template #isCustom="{ scope, column }">
           <!-- 报警提示方式 -->
           <span v-if="column.text === '报警提示方式'">
-            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
-            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+            <!-- <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag> -->
+            <el-tag
+              v-for="item in scope.row.alarmNote"
+              v-show="item"
+              :key="item"
+              :type="item === '消息提醒' ? 'primary'
+                : item === '弹窗提醒' ? 'danger'
+                  : item === '报警音效' ? 'success' : 'info'
+              "
+              style="margin-left: 5px;"
+            >{{ item }}</el-tag>
           </span>
           <!-- 报警提示方式 -->
           <span v-if="column.text === '状态'">
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index d46453d..c1b9c9d 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,8 +8,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
-import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
+import {
+  getAlarmLevelListPage,
+  getAlarmTypeListPage,
+} from '@/api/home/rule/alarm'
+import {
+  addSpecialAlarmRule,
+  editSpecialAlarmRule,
+  getProductAlarmRule,
+} from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
 import { useCheckList } from '@/utils/useCheckList'
@@ -38,7 +45,9 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+  devcode: [
+    { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] },
+  ],
 } // 前端校验规则
 
 // 重置表单
@@ -57,28 +66,57 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
-  { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
-  { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
+  {
+    text: '报警类型',
+    value: 'alarmTypeId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-rule',
+    required: true,
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-level',
+    required: true,
+  },
+  {
+    text: '报警阈值',
+    value: 'alarmThreshold',
+    align: 'center',
+    type: 'input',
+    required: true,
+  },
 ])
 // 初始化对话框
 const isFirst = ref(true)
+// 初始数据
+const initDeviceCode = ref('')
+const initAlarmRule = ref<any[]>([])
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
   isFirst.value = true
   dialogFormVisible.value = true
-  if (dialogStatus.value === 'create') { // 如果是新增，清除验证
+  if (dialogStatus.value === 'create') {
+    // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
     //   dataFormRef.value.clearValidate()
     // })
     dataFormRef.value?.resetFields()
     list.value = []
+    initDeviceCode.value = ''
+    initAlarmRule.value = []
   }
-  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') {
+    // 如果是修改，将row中数据填写到输入框中
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    initDeviceCode.value = dataForm.value.devcode
+    console.log(row, '123')
     list.value = [
       {
         edit: dialogStatus.value === 'edit',
@@ -86,13 +124,41 @@
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
         alarmTypeId: row.alarmTypeId,
+        isConcentration: row.alarmType.includes('浓度'),
       },
     ]
+    initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
     isFirst.value = false
   })
 }
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      console.log(newVal, isFirst.value, '设备编号')
+      if (!isFirst.value) {
+        if (newVal !== initDeviceCode.value) {
+          getProductAlarmRule({ devCode: newVal }).then((res) => {
+            console.log(res.data, '报警规则')
+            list.value = res.data.map((item: any) => ({
+              edit: true,
+              alarmTypeId: item.alarmTypeId,
+              alarmThreshold: item.alarmThreshold,
+              alarmLevelId: item.alarmLevelId,
+              alarmRule: '',
+              isConcentration: item.alarmTypeName.includes('浓度'),
+            }))
+          })
+        }
+        else {
+          list.value = JSON.parse(JSON.stringify(initAlarmRule.value))
+        }
+      }
+    }
+  },
+)
 defineExpose({
   initDialog,
 })
@@ -103,20 +169,23 @@
     if (valid) {
       // 验证数据列
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        addSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '添加成功',
-              type: 'success',
-            })
-            // 通知父组件刷新状态
-            dialogFormVisible.value = false
-            setTimeout(() => {
-              emits('refresh')
-            })
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        addSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '添加成功',
+                type: 'success',
+              })
+              // 通知父组件刷新状态
+              dialogFormVisible.value = false
+              setTimeout(() => {
+                emits('refresh')
+              })
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -127,19 +196,22 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        editSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '修改成功',
-              type: 'success',
-            })
-            setTimeout(() => {
-              emits('refresh')
-            })
-            dialogFormVisible.value = false
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        editSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '修改成功',
+                type: 'success',
+              })
+              setTimeout(() => {
+                emits('refresh')
+              })
+              dialogFormVisible.value = false
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -147,17 +219,28 @@
 
 // 保存数据
 const saveData = () => {
+  if (!list.value.length) {
+    ElMessage.warning('报警规则为空')
+    return
+  }
+  if (list.value.filter((item: any) => item.edit).length) {
+    ElMessage.warning('请先保存报警规则')
+    return
+  }
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
     alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
-    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
+    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? ':' : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? item.alarmThreshold : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? '%LEL' : ''}`,
     alarmThreshold: item.alarmThreshold,
     devcode: dataForm.value.devcode,
     id: dataForm.value.id,
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
-    devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
+    devTypeName:
+      deviceList.value.filter(
+        (citem: any) => citem.value === dataForm.value.devcode,
+      )[0]?.name || '',
     // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
@@ -182,7 +265,7 @@
 // 保存行
 const saveRow = (scope: any) => {
   const row = scope.row as any
-  if (String(row.alarmThreshold) && row.alarmLevelId && row.alarmRule) {
+  if (String(row.alarmThreshold) && row.alarmLevelId) {
     list.value[scope.$index].edit = false
   }
   else {
@@ -195,15 +278,11 @@
 }
 // 删除行
 const removeRow = (scope: any) => {
-  ElMessageBox.confirm(
-    '确定要删除该数据吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
+  ElMessageBox.confirm('确定要删除该数据吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
     list.value = list.value.filter((item, index) => index !== scope.$index)
     ElMessage.success('操作成功')
   })
@@ -213,14 +292,16 @@
 const fetchDict = () => {
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
-    deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.typeName,
-      id: item.id,
-      value: item.devcode,
-      productId: item.productId,
-      position: item.position,
-      tagNumber: item.tagNumber,
-    })).filter((item: any) => item.productId && item.value)
+    deviceList.value = res.data.rows
+      .map((item: any) => ({
+        name: item.typeName,
+        id: item.id,
+        value: item.devcode,
+        productId: item.productId,
+        position: item.position,
+        tagNumber: item.tagNumber,
+      }))
+      .filter((item: any) => item.productId && item.value)
     // 产品
     getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
       productList.value = res.data.rows.map((item: any) => ({
@@ -251,57 +332,110 @@
 fetchDict()
 
 // 监听设备编号，自动填充产品，安装位号，详细地址
-watch(() => dataForm.value.devcode, (newVal) => {
-  if (newVal) {
-    const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
-    console.log(current, 'current')
-    if (current.length) {
-      dataForm.value.productId = current[0].productId
-      dataForm.value.tagNumber = current[0].tagNumber
-      dataForm.value.position = current[0].position
-      // 根据设备类型寻找报警类型
-      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
-        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
-          name: item.alarmType,
-          id: item.id,
-          value: item.id,
-          // alarmTypeId: item.id,
-        }))
-      })
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      const current = deviceList.value.filter(
+        (item: any) => item.value === dataForm.value.devcode,
+      )
+      console.log(current, 'current')
+      if (current.length) {
+        dataForm.value.productId = current[0].productId
+        dataForm.value.tagNumber = current[0].tagNumber
+        dataForm.value.position = current[0].position
+        // 根据设备类型寻找报警类型
+        getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+          alarmRuleList.value = res.data.rows
+            .filter((item: any) =>
+              item.deviceTypeName.includes(current[0].name),
+            )
+            .map((item: any) => ({
+              name: item.alarmType,
+              id: item.id,
+              value: item.id,
+              // alarmTypeId: item.id,
+            }))
+        })
+      }
+      if (isFirst.value) {
+        return
+      }
+      alarmRuleList.value = []
+      list.value = []
     }
-    if (isFirst.value) {
-      return
-    }
-    alarmRuleList.value = []
-    list.value = []
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
+// 改变报警类型
+const changeAlarmType = (value: string, index: number) => {
+  console.log(value, index, 'valuevaluevalue')
+  // alarmRuleList
+  const alarmTypeName
+    = alarmRuleList.value.filter(item => item.id === value)[0]?.name || ''
+  console.log(alarmTypeName, 'alarmTypeName')
+  if (alarmTypeName.includes('浓度')) {
+    list.value[index].isConcentration = true
   }
-}, {
-  deep: true,
-  immediate: true,
-})
+  else {
+    list.value[index].isConcentration = false
+  }
+}
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}特殊报警规则`" append-to-body width="900px">
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="`${textMap[dialogStatus]}特殊报警规则`"
+    append-to-body
+    width="900px"
+  >
     <el-form
-      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right"
-      :disabled="dialogStatus === 'detail'" label-width="110px"
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-position="right"
+      :disabled="dialogStatus === 'detail'"
+      label-width="110px"
     >
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
-            <el-select v-model.trim="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
-              <el-option v-for="item in deviceList" :key="item.id" :label="item.value" :value="item.value" />
+            <el-select
+              v-model.trim="dataForm.devcode"
+              placeholder="设备编号"
+              style="width: 100%;"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品" prop="productId">
             <el-select
-              v-model.trim="dataForm.productId" placeholder="产品" style="width: 100%;" clearable filterable
+              v-model.trim="dataForm.productId"
+              placeholder="产品"
+              style="width: 100%;"
+              clearable
+              filterable
               disabled
             >
-              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -310,7 +444,11 @@
         <el-col :span="12">
           <el-form-item label="安装位号" prop="tagNumber">
             <el-input
-              v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;" disabled
+              v-model.trim="dataForm.tagNumber"
+              type="text"
+              placeholder="安装位号"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -318,7 +456,11 @@
         <el-col :span="12">
           <el-form-item label="详细地址" prop="position">
             <el-input
-              v-model.trim="dataForm.position" type="text" placeholder="详细地址" style="width: 100%;" disabled
+              v-model.trim="dataForm.position"
+              type="text"
+              placeholder="详细地址"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -335,14 +477,20 @@
             <table-container title="报警规则">
               <template #btns-right>
                 <!-- 操作 -->
-                <div>
+                <!-- <div>
                   <el-button v-if="dialogStatus === 'create'" type="primary" @click="addRow">
                     新增
                   </el-button>
-                </div>
+                </div> -->
               </template>
               <!-- 查询结果Table显示 -->
-              <normal-table :data="list" :total="0" :columns="[]" :query="{}" :pagination="false">
+              <normal-table
+                :data="list"
+                :total="0"
+                :columns="[]"
+                :query="{}"
+                :pagination="false"
+              >
                 <template #preColumns>
                   <el-table-column label="序号" width="55" align="center">
                     <template #default="scope">
@@ -351,28 +499,61 @@
                   </el-table-column>
                 </template>
                 <template #columns>
-                  <el-table-column v-for="item in columns" :key="item.text" :label="item.text" align="center">
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.text"
+                    :label="item.text"
+                    align="center"
+                  >
                     <template #default="scope">
                       <!-- 报警规则 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-rule'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警类型"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
+                          @change="
+                            () => {
+                              changeAlarmType(
+                                scope.row[item.value],
+                                scope.$index,
+                              )
+                            }
+                          "
                         >
                           <el-option
-                            v-for="item in alarmRuleList" :key="item.id" :label="item.name"
+                            v-for="item in alarmRuleList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.id"
                           />
                         </el-select>
                       </template>
                       <!-- 报警等级 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-level'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-level'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警等级" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警等级"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
                         >
                           <el-option
-                            v-for="item in alarmLevelList" :key="item.id" :label="item.name"
+                            v-for="item in alarmLevelList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.value"
                           />
                         </el-select>
@@ -380,29 +561,49 @@
                       <!-- 报警阈值 -->
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input
-                          v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
-                          style="width: 60%;" :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警阈值"
+                          clearable
+                          type="number"
+                          style="width: 60%;"
+                          :disabled="
+                            !scope.row.edit || !scope.row.isConcentration
+                          "
                         />
                         <span>%LEL</span>
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dialogStatus === 'create'" label="操作" width="140" align="center">
+                  <el-table-column
+                    v-if="dialogStatus === 'create' || dialogStatus === 'edit'"
+                    label="操作"
+                    width="140"
+                    align="center"
+                  >
                     <template #default="scope">
                       <el-button
-                        v-if="scope.row.edit === true" type="primary" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="primary"
+                        link
+                        size="small"
                         @click="saveRow(scope)"
                       >
                         保存
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === false" type="primary" link size="small"
+                        v-if="scope.row.edit === false"
+                        type="primary"
+                        link
+                        size="small"
                         @click="editRow(scope)"
                       >
                         编辑
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === true" type="danger" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="danger"
+                        link
+                        size="small"
                         @click="removeRow(scope)"
                       >
                         删除

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index c44d4da..e62199c 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,13 +25,13 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
   { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
@@ -64,6 +64,7 @@
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
       ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
+      alarmNote: item.alarmNote.split(','),
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -290,8 +291,18 @@
         <template #isCustom="{ scope, column }">
           <!-- 报警提示方式 -->
           <span v-if="column.text === '报警提示方式'">
-            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
-            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+            <!-- <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag> -->
+            <el-tag
+              v-for="item in scope.row.alarmNote"
+              v-show="item"
+              :key="item"
+              :type="item === '消息提醒' ? 'primary'
+                : item === '弹窗提醒' ? 'danger'
+                  : item === '报警音效' ? 'success' : 'info'
+              "
+              style="margin-left: 5px;"
+            >{{ item }}</el-tag>
           </span>
           <!-- 报警提示方式 -->
           <span v-if="column.text === '状态'">
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index d46453d..c1b9c9d 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,8 +8,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
-import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
+import {
+  getAlarmLevelListPage,
+  getAlarmTypeListPage,
+} from '@/api/home/rule/alarm'
+import {
+  addSpecialAlarmRule,
+  editSpecialAlarmRule,
+  getProductAlarmRule,
+} from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
 import { useCheckList } from '@/utils/useCheckList'
@@ -38,7 +45,9 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+  devcode: [
+    { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] },
+  ],
 } // 前端校验规则
 
 // 重置表单
@@ -57,28 +66,57 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
-  { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
-  { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
+  {
+    text: '报警类型',
+    value: 'alarmTypeId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-rule',
+    required: true,
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-level',
+    required: true,
+  },
+  {
+    text: '报警阈值',
+    value: 'alarmThreshold',
+    align: 'center',
+    type: 'input',
+    required: true,
+  },
 ])
 // 初始化对话框
 const isFirst = ref(true)
+// 初始数据
+const initDeviceCode = ref('')
+const initAlarmRule = ref<any[]>([])
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
   isFirst.value = true
   dialogFormVisible.value = true
-  if (dialogStatus.value === 'create') { // 如果是新增，清除验证
+  if (dialogStatus.value === 'create') {
+    // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
     //   dataFormRef.value.clearValidate()
     // })
     dataFormRef.value?.resetFields()
     list.value = []
+    initDeviceCode.value = ''
+    initAlarmRule.value = []
   }
-  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') {
+    // 如果是修改，将row中数据填写到输入框中
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    initDeviceCode.value = dataForm.value.devcode
+    console.log(row, '123')
     list.value = [
       {
         edit: dialogStatus.value === 'edit',
@@ -86,13 +124,41 @@
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
         alarmTypeId: row.alarmTypeId,
+        isConcentration: row.alarmType.includes('浓度'),
       },
     ]
+    initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
     isFirst.value = false
   })
 }
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      console.log(newVal, isFirst.value, '设备编号')
+      if (!isFirst.value) {
+        if (newVal !== initDeviceCode.value) {
+          getProductAlarmRule({ devCode: newVal }).then((res) => {
+            console.log(res.data, '报警规则')
+            list.value = res.data.map((item: any) => ({
+              edit: true,
+              alarmTypeId: item.alarmTypeId,
+              alarmThreshold: item.alarmThreshold,
+              alarmLevelId: item.alarmLevelId,
+              alarmRule: '',
+              isConcentration: item.alarmTypeName.includes('浓度'),
+            }))
+          })
+        }
+        else {
+          list.value = JSON.parse(JSON.stringify(initAlarmRule.value))
+        }
+      }
+    }
+  },
+)
 defineExpose({
   initDialog,
 })
@@ -103,20 +169,23 @@
     if (valid) {
       // 验证数据列
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        addSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '添加成功',
-              type: 'success',
-            })
-            // 通知父组件刷新状态
-            dialogFormVisible.value = false
-            setTimeout(() => {
-              emits('refresh')
-            })
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        addSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '添加成功',
+                type: 'success',
+              })
+              // 通知父组件刷新状态
+              dialogFormVisible.value = false
+              setTimeout(() => {
+                emits('refresh')
+              })
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -127,19 +196,22 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        editSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '修改成功',
-              type: 'success',
-            })
-            setTimeout(() => {
-              emits('refresh')
-            })
-            dialogFormVisible.value = false
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        editSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '修改成功',
+                type: 'success',
+              })
+              setTimeout(() => {
+                emits('refresh')
+              })
+              dialogFormVisible.value = false
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -147,17 +219,28 @@
 
 // 保存数据
 const saveData = () => {
+  if (!list.value.length) {
+    ElMessage.warning('报警规则为空')
+    return
+  }
+  if (list.value.filter((item: any) => item.edit).length) {
+    ElMessage.warning('请先保存报警规则')
+    return
+  }
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
     alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
-    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
+    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? ':' : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? item.alarmThreshold : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? '%LEL' : ''}`,
     alarmThreshold: item.alarmThreshold,
     devcode: dataForm.value.devcode,
     id: dataForm.value.id,
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
-    devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
+    devTypeName:
+      deviceList.value.filter(
+        (citem: any) => citem.value === dataForm.value.devcode,
+      )[0]?.name || '',
     // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
@@ -182,7 +265,7 @@
 // 保存行
 const saveRow = (scope: any) => {
   const row = scope.row as any
-  if (String(row.alarmThreshold) && row.alarmLevelId && row.alarmRule) {
+  if (String(row.alarmThreshold) && row.alarmLevelId) {
     list.value[scope.$index].edit = false
   }
   else {
@@ -195,15 +278,11 @@
 }
 // 删除行
 const removeRow = (scope: any) => {
-  ElMessageBox.confirm(
-    '确定要删除该数据吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
+  ElMessageBox.confirm('确定要删除该数据吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
     list.value = list.value.filter((item, index) => index !== scope.$index)
     ElMessage.success('操作成功')
   })
@@ -213,14 +292,16 @@
 const fetchDict = () => {
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
-    deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.typeName,
-      id: item.id,
-      value: item.devcode,
-      productId: item.productId,
-      position: item.position,
-      tagNumber: item.tagNumber,
-    })).filter((item: any) => item.productId && item.value)
+    deviceList.value = res.data.rows
+      .map((item: any) => ({
+        name: item.typeName,
+        id: item.id,
+        value: item.devcode,
+        productId: item.productId,
+        position: item.position,
+        tagNumber: item.tagNumber,
+      }))
+      .filter((item: any) => item.productId && item.value)
     // 产品
     getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
       productList.value = res.data.rows.map((item: any) => ({
@@ -251,57 +332,110 @@
 fetchDict()
 
 // 监听设备编号，自动填充产品，安装位号，详细地址
-watch(() => dataForm.value.devcode, (newVal) => {
-  if (newVal) {
-    const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
-    console.log(current, 'current')
-    if (current.length) {
-      dataForm.value.productId = current[0].productId
-      dataForm.value.tagNumber = current[0].tagNumber
-      dataForm.value.position = current[0].position
-      // 根据设备类型寻找报警类型
-      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
-        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
-          name: item.alarmType,
-          id: item.id,
-          value: item.id,
-          // alarmTypeId: item.id,
-        }))
-      })
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      const current = deviceList.value.filter(
+        (item: any) => item.value === dataForm.value.devcode,
+      )
+      console.log(current, 'current')
+      if (current.length) {
+        dataForm.value.productId = current[0].productId
+        dataForm.value.tagNumber = current[0].tagNumber
+        dataForm.value.position = current[0].position
+        // 根据设备类型寻找报警类型
+        getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+          alarmRuleList.value = res.data.rows
+            .filter((item: any) =>
+              item.deviceTypeName.includes(current[0].name),
+            )
+            .map((item: any) => ({
+              name: item.alarmType,
+              id: item.id,
+              value: item.id,
+              // alarmTypeId: item.id,
+            }))
+        })
+      }
+      if (isFirst.value) {
+        return
+      }
+      alarmRuleList.value = []
+      list.value = []
     }
-    if (isFirst.value) {
-      return
-    }
-    alarmRuleList.value = []
-    list.value = []
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
+// 改变报警类型
+const changeAlarmType = (value: string, index: number) => {
+  console.log(value, index, 'valuevaluevalue')
+  // alarmRuleList
+  const alarmTypeName
+    = alarmRuleList.value.filter(item => item.id === value)[0]?.name || ''
+  console.log(alarmTypeName, 'alarmTypeName')
+  if (alarmTypeName.includes('浓度')) {
+    list.value[index].isConcentration = true
   }
-}, {
-  deep: true,
-  immediate: true,
-})
+  else {
+    list.value[index].isConcentration = false
+  }
+}
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}特殊报警规则`" append-to-body width="900px">
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="`${textMap[dialogStatus]}特殊报警规则`"
+    append-to-body
+    width="900px"
+  >
     <el-form
-      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right"
-      :disabled="dialogStatus === 'detail'" label-width="110px"
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-position="right"
+      :disabled="dialogStatus === 'detail'"
+      label-width="110px"
     >
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
-            <el-select v-model.trim="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
-              <el-option v-for="item in deviceList" :key="item.id" :label="item.value" :value="item.value" />
+            <el-select
+              v-model.trim="dataForm.devcode"
+              placeholder="设备编号"
+              style="width: 100%;"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品" prop="productId">
             <el-select
-              v-model.trim="dataForm.productId" placeholder="产品" style="width: 100%;" clearable filterable
+              v-model.trim="dataForm.productId"
+              placeholder="产品"
+              style="width: 100%;"
+              clearable
+              filterable
               disabled
             >
-              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -310,7 +444,11 @@
         <el-col :span="12">
           <el-form-item label="安装位号" prop="tagNumber">
             <el-input
-              v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;" disabled
+              v-model.trim="dataForm.tagNumber"
+              type="text"
+              placeholder="安装位号"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -318,7 +456,11 @@
         <el-col :span="12">
           <el-form-item label="详细地址" prop="position">
             <el-input
-              v-model.trim="dataForm.position" type="text" placeholder="详细地址" style="width: 100%;" disabled
+              v-model.trim="dataForm.position"
+              type="text"
+              placeholder="详细地址"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -335,14 +477,20 @@
             <table-container title="报警规则">
               <template #btns-right>
                 <!-- 操作 -->
-                <div>
+                <!-- <div>
                   <el-button v-if="dialogStatus === 'create'" type="primary" @click="addRow">
                     新增
                   </el-button>
-                </div>
+                </div> -->
               </template>
               <!-- 查询结果Table显示 -->
-              <normal-table :data="list" :total="0" :columns="[]" :query="{}" :pagination="false">
+              <normal-table
+                :data="list"
+                :total="0"
+                :columns="[]"
+                :query="{}"
+                :pagination="false"
+              >
                 <template #preColumns>
                   <el-table-column label="序号" width="55" align="center">
                     <template #default="scope">
@@ -351,28 +499,61 @@
                   </el-table-column>
                 </template>
                 <template #columns>
-                  <el-table-column v-for="item in columns" :key="item.text" :label="item.text" align="center">
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.text"
+                    :label="item.text"
+                    align="center"
+                  >
                     <template #default="scope">
                       <!-- 报警规则 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-rule'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警类型"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
+                          @change="
+                            () => {
+                              changeAlarmType(
+                                scope.row[item.value],
+                                scope.$index,
+                              )
+                            }
+                          "
                         >
                           <el-option
-                            v-for="item in alarmRuleList" :key="item.id" :label="item.name"
+                            v-for="item in alarmRuleList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.id"
                           />
                         </el-select>
                       </template>
                       <!-- 报警等级 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-level'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-level'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警等级" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警等级"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
                         >
                           <el-option
-                            v-for="item in alarmLevelList" :key="item.id" :label="item.name"
+                            v-for="item in alarmLevelList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.value"
                           />
                         </el-select>
@@ -380,29 +561,49 @@
                       <!-- 报警阈值 -->
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input
-                          v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
-                          style="width: 60%;" :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警阈值"
+                          clearable
+                          type="number"
+                          style="width: 60%;"
+                          :disabled="
+                            !scope.row.edit || !scope.row.isConcentration
+                          "
                         />
                         <span>%LEL</span>
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dialogStatus === 'create'" label="操作" width="140" align="center">
+                  <el-table-column
+                    v-if="dialogStatus === 'create' || dialogStatus === 'edit'"
+                    label="操作"
+                    width="140"
+                    align="center"
+                  >
                     <template #default="scope">
                       <el-button
-                        v-if="scope.row.edit === true" type="primary" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="primary"
+                        link
+                        size="small"
                         @click="saveRow(scope)"
                       >
                         保存
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === false" type="primary" link size="small"
+                        v-if="scope.row.edit === false"
+                        type="primary"
+                        link
+                        size="small"
                         @click="editRow(scope)"
                       >
                         编辑
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === true" type="danger" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="danger"
+                        link
+                        size="small"
                         @click="removeRow(scope)"
                       >
                         删除
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index d028564..73c1336 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -139,7 +139,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="70" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index c44d4da..e62199c 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,13 +25,13 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
   { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
@@ -64,6 +64,7 @@
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
       ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
+      alarmNote: item.alarmNote.split(','),
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -290,8 +291,18 @@
         <template #isCustom="{ scope, column }">
           <!-- 报警提示方式 -->
           <span v-if="column.text === '报警提示方式'">
-            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
-            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+            <!-- <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag> -->
+            <el-tag
+              v-for="item in scope.row.alarmNote"
+              v-show="item"
+              :key="item"
+              :type="item === '消息提醒' ? 'primary'
+                : item === '弹窗提醒' ? 'danger'
+                  : item === '报警音效' ? 'success' : 'info'
+              "
+              style="margin-left: 5px;"
+            >{{ item }}</el-tag>
           </span>
           <!-- 报警提示方式 -->
           <span v-if="column.text === '状态'">
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index d46453d..c1b9c9d 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,8 +8,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
-import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
+import {
+  getAlarmLevelListPage,
+  getAlarmTypeListPage,
+} from '@/api/home/rule/alarm'
+import {
+  addSpecialAlarmRule,
+  editSpecialAlarmRule,
+  getProductAlarmRule,
+} from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
 import { useCheckList } from '@/utils/useCheckList'
@@ -38,7 +45,9 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+  devcode: [
+    { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] },
+  ],
 } // 前端校验规则
 
 // 重置表单
@@ -57,28 +66,57 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
-  { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
-  { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
+  {
+    text: '报警类型',
+    value: 'alarmTypeId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-rule',
+    required: true,
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-level',
+    required: true,
+  },
+  {
+    text: '报警阈值',
+    value: 'alarmThreshold',
+    align: 'center',
+    type: 'input',
+    required: true,
+  },
 ])
 // 初始化对话框
 const isFirst = ref(true)
+// 初始数据
+const initDeviceCode = ref('')
+const initAlarmRule = ref<any[]>([])
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
   isFirst.value = true
   dialogFormVisible.value = true
-  if (dialogStatus.value === 'create') { // 如果是新增，清除验证
+  if (dialogStatus.value === 'create') {
+    // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
     //   dataFormRef.value.clearValidate()
     // })
     dataFormRef.value?.resetFields()
     list.value = []
+    initDeviceCode.value = ''
+    initAlarmRule.value = []
   }
-  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') {
+    // 如果是修改，将row中数据填写到输入框中
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    initDeviceCode.value = dataForm.value.devcode
+    console.log(row, '123')
     list.value = [
       {
         edit: dialogStatus.value === 'edit',
@@ -86,13 +124,41 @@
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
         alarmTypeId: row.alarmTypeId,
+        isConcentration: row.alarmType.includes('浓度'),
       },
     ]
+    initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
     isFirst.value = false
   })
 }
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      console.log(newVal, isFirst.value, '设备编号')
+      if (!isFirst.value) {
+        if (newVal !== initDeviceCode.value) {
+          getProductAlarmRule({ devCode: newVal }).then((res) => {
+            console.log(res.data, '报警规则')
+            list.value = res.data.map((item: any) => ({
+              edit: true,
+              alarmTypeId: item.alarmTypeId,
+              alarmThreshold: item.alarmThreshold,
+              alarmLevelId: item.alarmLevelId,
+              alarmRule: '',
+              isConcentration: item.alarmTypeName.includes('浓度'),
+            }))
+          })
+        }
+        else {
+          list.value = JSON.parse(JSON.stringify(initAlarmRule.value))
+        }
+      }
+    }
+  },
+)
 defineExpose({
   initDialog,
 })
@@ -103,20 +169,23 @@
     if (valid) {
       // 验证数据列
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        addSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '添加成功',
-              type: 'success',
-            })
-            // 通知父组件刷新状态
-            dialogFormVisible.value = false
-            setTimeout(() => {
-              emits('refresh')
-            })
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        addSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '添加成功',
+                type: 'success',
+              })
+              // 通知父组件刷新状态
+              dialogFormVisible.value = false
+              setTimeout(() => {
+                emits('refresh')
+              })
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -127,19 +196,22 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        editSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '修改成功',
-              type: 'success',
-            })
-            setTimeout(() => {
-              emits('refresh')
-            })
-            dialogFormVisible.value = false
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        editSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '修改成功',
+                type: 'success',
+              })
+              setTimeout(() => {
+                emits('refresh')
+              })
+              dialogFormVisible.value = false
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -147,17 +219,28 @@
 
 // 保存数据
 const saveData = () => {
+  if (!list.value.length) {
+    ElMessage.warning('报警规则为空')
+    return
+  }
+  if (list.value.filter((item: any) => item.edit).length) {
+    ElMessage.warning('请先保存报警规则')
+    return
+  }
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
     alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
-    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
+    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? ':' : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? item.alarmThreshold : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? '%LEL' : ''}`,
     alarmThreshold: item.alarmThreshold,
     devcode: dataForm.value.devcode,
     id: dataForm.value.id,
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
-    devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
+    devTypeName:
+      deviceList.value.filter(
+        (citem: any) => citem.value === dataForm.value.devcode,
+      )[0]?.name || '',
     // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
@@ -182,7 +265,7 @@
 // 保存行
 const saveRow = (scope: any) => {
   const row = scope.row as any
-  if (String(row.alarmThreshold) && row.alarmLevelId && row.alarmRule) {
+  if (String(row.alarmThreshold) && row.alarmLevelId) {
     list.value[scope.$index].edit = false
   }
   else {
@@ -195,15 +278,11 @@
 }
 // 删除行
 const removeRow = (scope: any) => {
-  ElMessageBox.confirm(
-    '确定要删除该数据吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
+  ElMessageBox.confirm('确定要删除该数据吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
     list.value = list.value.filter((item, index) => index !== scope.$index)
     ElMessage.success('操作成功')
   })
@@ -213,14 +292,16 @@
 const fetchDict = () => {
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
-    deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.typeName,
-      id: item.id,
-      value: item.devcode,
-      productId: item.productId,
-      position: item.position,
-      tagNumber: item.tagNumber,
-    })).filter((item: any) => item.productId && item.value)
+    deviceList.value = res.data.rows
+      .map((item: any) => ({
+        name: item.typeName,
+        id: item.id,
+        value: item.devcode,
+        productId: item.productId,
+        position: item.position,
+        tagNumber: item.tagNumber,
+      }))
+      .filter((item: any) => item.productId && item.value)
     // 产品
     getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
       productList.value = res.data.rows.map((item: any) => ({
@@ -251,57 +332,110 @@
 fetchDict()
 
 // 监听设备编号，自动填充产品，安装位号，详细地址
-watch(() => dataForm.value.devcode, (newVal) => {
-  if (newVal) {
-    const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
-    console.log(current, 'current')
-    if (current.length) {
-      dataForm.value.productId = current[0].productId
-      dataForm.value.tagNumber = current[0].tagNumber
-      dataForm.value.position = current[0].position
-      // 根据设备类型寻找报警类型
-      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
-        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
-          name: item.alarmType,
-          id: item.id,
-          value: item.id,
-          // alarmTypeId: item.id,
-        }))
-      })
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      const current = deviceList.value.filter(
+        (item: any) => item.value === dataForm.value.devcode,
+      )
+      console.log(current, 'current')
+      if (current.length) {
+        dataForm.value.productId = current[0].productId
+        dataForm.value.tagNumber = current[0].tagNumber
+        dataForm.value.position = current[0].position
+        // 根据设备类型寻找报警类型
+        getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+          alarmRuleList.value = res.data.rows
+            .filter((item: any) =>
+              item.deviceTypeName.includes(current[0].name),
+            )
+            .map((item: any) => ({
+              name: item.alarmType,
+              id: item.id,
+              value: item.id,
+              // alarmTypeId: item.id,
+            }))
+        })
+      }
+      if (isFirst.value) {
+        return
+      }
+      alarmRuleList.value = []
+      list.value = []
     }
-    if (isFirst.value) {
-      return
-    }
-    alarmRuleList.value = []
-    list.value = []
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
+// 改变报警类型
+const changeAlarmType = (value: string, index: number) => {
+  console.log(value, index, 'valuevaluevalue')
+  // alarmRuleList
+  const alarmTypeName
+    = alarmRuleList.value.filter(item => item.id === value)[0]?.name || ''
+  console.log(alarmTypeName, 'alarmTypeName')
+  if (alarmTypeName.includes('浓度')) {
+    list.value[index].isConcentration = true
   }
-}, {
-  deep: true,
-  immediate: true,
-})
+  else {
+    list.value[index].isConcentration = false
+  }
+}
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}特殊报警规则`" append-to-body width="900px">
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="`${textMap[dialogStatus]}特殊报警规则`"
+    append-to-body
+    width="900px"
+  >
     <el-form
-      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right"
-      :disabled="dialogStatus === 'detail'" label-width="110px"
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-position="right"
+      :disabled="dialogStatus === 'detail'"
+      label-width="110px"
     >
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
-            <el-select v-model.trim="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
-              <el-option v-for="item in deviceList" :key="item.id" :label="item.value" :value="item.value" />
+            <el-select
+              v-model.trim="dataForm.devcode"
+              placeholder="设备编号"
+              style="width: 100%;"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品" prop="productId">
             <el-select
-              v-model.trim="dataForm.productId" placeholder="产品" style="width: 100%;" clearable filterable
+              v-model.trim="dataForm.productId"
+              placeholder="产品"
+              style="width: 100%;"
+              clearable
+              filterable
               disabled
             >
-              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -310,7 +444,11 @@
         <el-col :span="12">
           <el-form-item label="安装位号" prop="tagNumber">
             <el-input
-              v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;" disabled
+              v-model.trim="dataForm.tagNumber"
+              type="text"
+              placeholder="安装位号"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -318,7 +456,11 @@
         <el-col :span="12">
           <el-form-item label="详细地址" prop="position">
             <el-input
-              v-model.trim="dataForm.position" type="text" placeholder="详细地址" style="width: 100%;" disabled
+              v-model.trim="dataForm.position"
+              type="text"
+              placeholder="详细地址"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -335,14 +477,20 @@
             <table-container title="报警规则">
               <template #btns-right>
                 <!-- 操作 -->
-                <div>
+                <!-- <div>
                   <el-button v-if="dialogStatus === 'create'" type="primary" @click="addRow">
                     新增
                   </el-button>
-                </div>
+                </div> -->
               </template>
               <!-- 查询结果Table显示 -->
-              <normal-table :data="list" :total="0" :columns="[]" :query="{}" :pagination="false">
+              <normal-table
+                :data="list"
+                :total="0"
+                :columns="[]"
+                :query="{}"
+                :pagination="false"
+              >
                 <template #preColumns>
                   <el-table-column label="序号" width="55" align="center">
                     <template #default="scope">
@@ -351,28 +499,61 @@
                   </el-table-column>
                 </template>
                 <template #columns>
-                  <el-table-column v-for="item in columns" :key="item.text" :label="item.text" align="center">
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.text"
+                    :label="item.text"
+                    align="center"
+                  >
                     <template #default="scope">
                       <!-- 报警规则 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-rule'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警类型"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
+                          @change="
+                            () => {
+                              changeAlarmType(
+                                scope.row[item.value],
+                                scope.$index,
+                              )
+                            }
+                          "
                         >
                           <el-option
-                            v-for="item in alarmRuleList" :key="item.id" :label="item.name"
+                            v-for="item in alarmRuleList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.id"
                           />
                         </el-select>
                       </template>
                       <!-- 报警等级 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-level'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-level'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警等级" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警等级"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
                         >
                           <el-option
-                            v-for="item in alarmLevelList" :key="item.id" :label="item.name"
+                            v-for="item in alarmLevelList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.value"
                           />
                         </el-select>
@@ -380,29 +561,49 @@
                       <!-- 报警阈值 -->
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input
-                          v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
-                          style="width: 60%;" :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警阈值"
+                          clearable
+                          type="number"
+                          style="width: 60%;"
+                          :disabled="
+                            !scope.row.edit || !scope.row.isConcentration
+                          "
                         />
                         <span>%LEL</span>
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dialogStatus === 'create'" label="操作" width="140" align="center">
+                  <el-table-column
+                    v-if="dialogStatus === 'create' || dialogStatus === 'edit'"
+                    label="操作"
+                    width="140"
+                    align="center"
+                  >
                     <template #default="scope">
                       <el-button
-                        v-if="scope.row.edit === true" type="primary" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="primary"
+                        link
+                        size="small"
                         @click="saveRow(scope)"
                       >
                         保存
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === false" type="primary" link size="small"
+                        v-if="scope.row.edit === false"
+                        type="primary"
+                        link
+                        size="small"
                         @click="editRow(scope)"
                       >
                         编辑
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === true" type="danger" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="danger"
+                        link
+                        size="small"
                         @click="removeRow(scope)"
                       >
                         删除
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index d028564..73c1336 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -139,7 +139,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="70" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 185403c..4e4b732 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -76,8 +76,8 @@
     align: 'center',
   },
   {
-    text: '运行状态',
-    value: 'validName',
+    text: '监控状态',
+    value: 'monitorStateName',
     align: 'center',
   },
   {

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index c44d4da..e62199c 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,13 +25,13 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
   { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
@@ -64,6 +64,7 @@
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
       ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
+      alarmNote: item.alarmNote.split(','),
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -290,8 +291,18 @@
         <template #isCustom="{ scope, column }">
           <!-- 报警提示方式 -->
           <span v-if="column.text === '报警提示方式'">
-            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
-            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+            <!-- <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag> -->
+            <el-tag
+              v-for="item in scope.row.alarmNote"
+              v-show="item"
+              :key="item"
+              :type="item === '消息提醒' ? 'primary'
+                : item === '弹窗提醒' ? 'danger'
+                  : item === '报警音效' ? 'success' : 'info'
+              "
+              style="margin-left: 5px;"
+            >{{ item }}</el-tag>
           </span>
           <!-- 报警提示方式 -->
           <span v-if="column.text === '状态'">
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index d46453d..c1b9c9d 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,8 +8,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
-import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
+import {
+  getAlarmLevelListPage,
+  getAlarmTypeListPage,
+} from '@/api/home/rule/alarm'
+import {
+  addSpecialAlarmRule,
+  editSpecialAlarmRule,
+  getProductAlarmRule,
+} from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
 import { useCheckList } from '@/utils/useCheckList'
@@ -38,7 +45,9 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+  devcode: [
+    { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] },
+  ],
 } // 前端校验规则
 
 // 重置表单
@@ -57,28 +66,57 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
-  { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
-  { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
+  {
+    text: '报警类型',
+    value: 'alarmTypeId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-rule',
+    required: true,
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-level',
+    required: true,
+  },
+  {
+    text: '报警阈值',
+    value: 'alarmThreshold',
+    align: 'center',
+    type: 'input',
+    required: true,
+  },
 ])
 // 初始化对话框
 const isFirst = ref(true)
+// 初始数据
+const initDeviceCode = ref('')
+const initAlarmRule = ref<any[]>([])
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
   isFirst.value = true
   dialogFormVisible.value = true
-  if (dialogStatus.value === 'create') { // 如果是新增，清除验证
+  if (dialogStatus.value === 'create') {
+    // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
     //   dataFormRef.value.clearValidate()
     // })
     dataFormRef.value?.resetFields()
     list.value = []
+    initDeviceCode.value = ''
+    initAlarmRule.value = []
   }
-  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') {
+    // 如果是修改，将row中数据填写到输入框中
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    initDeviceCode.value = dataForm.value.devcode
+    console.log(row, '123')
     list.value = [
       {
         edit: dialogStatus.value === 'edit',
@@ -86,13 +124,41 @@
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
         alarmTypeId: row.alarmTypeId,
+        isConcentration: row.alarmType.includes('浓度'),
       },
     ]
+    initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
     isFirst.value = false
   })
 }
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      console.log(newVal, isFirst.value, '设备编号')
+      if (!isFirst.value) {
+        if (newVal !== initDeviceCode.value) {
+          getProductAlarmRule({ devCode: newVal }).then((res) => {
+            console.log(res.data, '报警规则')
+            list.value = res.data.map((item: any) => ({
+              edit: true,
+              alarmTypeId: item.alarmTypeId,
+              alarmThreshold: item.alarmThreshold,
+              alarmLevelId: item.alarmLevelId,
+              alarmRule: '',
+              isConcentration: item.alarmTypeName.includes('浓度'),
+            }))
+          })
+        }
+        else {
+          list.value = JSON.parse(JSON.stringify(initAlarmRule.value))
+        }
+      }
+    }
+  },
+)
 defineExpose({
   initDialog,
 })
@@ -103,20 +169,23 @@
     if (valid) {
       // 验证数据列
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        addSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '添加成功',
-              type: 'success',
-            })
-            // 通知父组件刷新状态
-            dialogFormVisible.value = false
-            setTimeout(() => {
-              emits('refresh')
-            })
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        addSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '添加成功',
+                type: 'success',
+              })
+              // 通知父组件刷新状态
+              dialogFormVisible.value = false
+              setTimeout(() => {
+                emits('refresh')
+              })
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -127,19 +196,22 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        editSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '修改成功',
-              type: 'success',
-            })
-            setTimeout(() => {
-              emits('refresh')
-            })
-            dialogFormVisible.value = false
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        editSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '修改成功',
+                type: 'success',
+              })
+              setTimeout(() => {
+                emits('refresh')
+              })
+              dialogFormVisible.value = false
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -147,17 +219,28 @@
 
 // 保存数据
 const saveData = () => {
+  if (!list.value.length) {
+    ElMessage.warning('报警规则为空')
+    return
+  }
+  if (list.value.filter((item: any) => item.edit).length) {
+    ElMessage.warning('请先保存报警规则')
+    return
+  }
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
     alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
-    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
+    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? ':' : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? item.alarmThreshold : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? '%LEL' : ''}`,
     alarmThreshold: item.alarmThreshold,
     devcode: dataForm.value.devcode,
     id: dataForm.value.id,
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
-    devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
+    devTypeName:
+      deviceList.value.filter(
+        (citem: any) => citem.value === dataForm.value.devcode,
+      )[0]?.name || '',
     // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
@@ -182,7 +265,7 @@
 // 保存行
 const saveRow = (scope: any) => {
   const row = scope.row as any
-  if (String(row.alarmThreshold) && row.alarmLevelId && row.alarmRule) {
+  if (String(row.alarmThreshold) && row.alarmLevelId) {
     list.value[scope.$index].edit = false
   }
   else {
@@ -195,15 +278,11 @@
 }
 // 删除行
 const removeRow = (scope: any) => {
-  ElMessageBox.confirm(
-    '确定要删除该数据吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
+  ElMessageBox.confirm('确定要删除该数据吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
     list.value = list.value.filter((item, index) => index !== scope.$index)
     ElMessage.success('操作成功')
   })
@@ -213,14 +292,16 @@
 const fetchDict = () => {
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
-    deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.typeName,
-      id: item.id,
-      value: item.devcode,
-      productId: item.productId,
-      position: item.position,
-      tagNumber: item.tagNumber,
-    })).filter((item: any) => item.productId && item.value)
+    deviceList.value = res.data.rows
+      .map((item: any) => ({
+        name: item.typeName,
+        id: item.id,
+        value: item.devcode,
+        productId: item.productId,
+        position: item.position,
+        tagNumber: item.tagNumber,
+      }))
+      .filter((item: any) => item.productId && item.value)
     // 产品
     getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
       productList.value = res.data.rows.map((item: any) => ({
@@ -251,57 +332,110 @@
 fetchDict()
 
 // 监听设备编号，自动填充产品，安装位号，详细地址
-watch(() => dataForm.value.devcode, (newVal) => {
-  if (newVal) {
-    const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
-    console.log(current, 'current')
-    if (current.length) {
-      dataForm.value.productId = current[0].productId
-      dataForm.value.tagNumber = current[0].tagNumber
-      dataForm.value.position = current[0].position
-      // 根据设备类型寻找报警类型
-      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
-        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
-          name: item.alarmType,
-          id: item.id,
-          value: item.id,
-          // alarmTypeId: item.id,
-        }))
-      })
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      const current = deviceList.value.filter(
+        (item: any) => item.value === dataForm.value.devcode,
+      )
+      console.log(current, 'current')
+      if (current.length) {
+        dataForm.value.productId = current[0].productId
+        dataForm.value.tagNumber = current[0].tagNumber
+        dataForm.value.position = current[0].position
+        // 根据设备类型寻找报警类型
+        getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+          alarmRuleList.value = res.data.rows
+            .filter((item: any) =>
+              item.deviceTypeName.includes(current[0].name),
+            )
+            .map((item: any) => ({
+              name: item.alarmType,
+              id: item.id,
+              value: item.id,
+              // alarmTypeId: item.id,
+            }))
+        })
+      }
+      if (isFirst.value) {
+        return
+      }
+      alarmRuleList.value = []
+      list.value = []
     }
-    if (isFirst.value) {
-      return
-    }
-    alarmRuleList.value = []
-    list.value = []
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
+// 改变报警类型
+const changeAlarmType = (value: string, index: number) => {
+  console.log(value, index, 'valuevaluevalue')
+  // alarmRuleList
+  const alarmTypeName
+    = alarmRuleList.value.filter(item => item.id === value)[0]?.name || ''
+  console.log(alarmTypeName, 'alarmTypeName')
+  if (alarmTypeName.includes('浓度')) {
+    list.value[index].isConcentration = true
   }
-}, {
-  deep: true,
-  immediate: true,
-})
+  else {
+    list.value[index].isConcentration = false
+  }
+}
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}特殊报警规则`" append-to-body width="900px">
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="`${textMap[dialogStatus]}特殊报警规则`"
+    append-to-body
+    width="900px"
+  >
     <el-form
-      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right"
-      :disabled="dialogStatus === 'detail'" label-width="110px"
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-position="right"
+      :disabled="dialogStatus === 'detail'"
+      label-width="110px"
     >
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
-            <el-select v-model.trim="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
-              <el-option v-for="item in deviceList" :key="item.id" :label="item.value" :value="item.value" />
+            <el-select
+              v-model.trim="dataForm.devcode"
+              placeholder="设备编号"
+              style="width: 100%;"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品" prop="productId">
             <el-select
-              v-model.trim="dataForm.productId" placeholder="产品" style="width: 100%;" clearable filterable
+              v-model.trim="dataForm.productId"
+              placeholder="产品"
+              style="width: 100%;"
+              clearable
+              filterable
               disabled
             >
-              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -310,7 +444,11 @@
         <el-col :span="12">
           <el-form-item label="安装位号" prop="tagNumber">
             <el-input
-              v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;" disabled
+              v-model.trim="dataForm.tagNumber"
+              type="text"
+              placeholder="安装位号"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -318,7 +456,11 @@
         <el-col :span="12">
           <el-form-item label="详细地址" prop="position">
             <el-input
-              v-model.trim="dataForm.position" type="text" placeholder="详细地址" style="width: 100%;" disabled
+              v-model.trim="dataForm.position"
+              type="text"
+              placeholder="详细地址"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -335,14 +477,20 @@
             <table-container title="报警规则">
               <template #btns-right>
                 <!-- 操作 -->
-                <div>
+                <!-- <div>
                   <el-button v-if="dialogStatus === 'create'" type="primary" @click="addRow">
                     新增
                   </el-button>
-                </div>
+                </div> -->
               </template>
               <!-- 查询结果Table显示 -->
-              <normal-table :data="list" :total="0" :columns="[]" :query="{}" :pagination="false">
+              <normal-table
+                :data="list"
+                :total="0"
+                :columns="[]"
+                :query="{}"
+                :pagination="false"
+              >
                 <template #preColumns>
                   <el-table-column label="序号" width="55" align="center">
                     <template #default="scope">
@@ -351,28 +499,61 @@
                   </el-table-column>
                 </template>
                 <template #columns>
-                  <el-table-column v-for="item in columns" :key="item.text" :label="item.text" align="center">
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.text"
+                    :label="item.text"
+                    align="center"
+                  >
                     <template #default="scope">
                       <!-- 报警规则 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-rule'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警类型"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
+                          @change="
+                            () => {
+                              changeAlarmType(
+                                scope.row[item.value],
+                                scope.$index,
+                              )
+                            }
+                          "
                         >
                           <el-option
-                            v-for="item in alarmRuleList" :key="item.id" :label="item.name"
+                            v-for="item in alarmRuleList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.id"
                           />
                         </el-select>
                       </template>
                       <!-- 报警等级 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-level'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-level'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警等级" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警等级"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
                         >
                           <el-option
-                            v-for="item in alarmLevelList" :key="item.id" :label="item.name"
+                            v-for="item in alarmLevelList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.value"
                           />
                         </el-select>
@@ -380,29 +561,49 @@
                       <!-- 报警阈值 -->
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input
-                          v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
-                          style="width: 60%;" :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警阈值"
+                          clearable
+                          type="number"
+                          style="width: 60%;"
+                          :disabled="
+                            !scope.row.edit || !scope.row.isConcentration
+                          "
                         />
                         <span>%LEL</span>
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dialogStatus === 'create'" label="操作" width="140" align="center">
+                  <el-table-column
+                    v-if="dialogStatus === 'create' || dialogStatus === 'edit'"
+                    label="操作"
+                    width="140"
+                    align="center"
+                  >
                     <template #default="scope">
                       <el-button
-                        v-if="scope.row.edit === true" type="primary" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="primary"
+                        link
+                        size="small"
                         @click="saveRow(scope)"
                       >
                         保存
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === false" type="primary" link size="small"
+                        v-if="scope.row.edit === false"
+                        type="primary"
+                        link
+                        size="small"
                         @click="editRow(scope)"
                       >
                         编辑
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === true" type="danger" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="danger"
+                        link
+                        size="small"
                         @click="removeRow(scope)"
                       >
                         删除
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index d028564..73c1336 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -139,7 +139,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="70" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 185403c..4e4b732 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -76,8 +76,8 @@
     align: 'center',
   },
   {
-    text: '运行状态',
-    value: 'validName',
+    text: '监控状态',
+    value: 'monitorStateName',
     align: 'center',
   },
   {
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 68598b9..0e47d63 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -260,7 +260,7 @@
       </div>
       <div v-for="item in gasData" :key="item.name" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
-        <span style="margin-left: 10px;width: 38%;display: inline-block;">{{ item.name }}</span>
+        <span style="margin-left: 10px;width: 38%;display: inline-block; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="item.name">{{ item.name }}</span>
         <span
           :class="item.state === '1' ? 'normal' : item.state === '0' ? 'offline' : item.state === '2' ? 'error' : ''"
           style="margin-left: 10px;"

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 5ecd2a0..665b61f 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -37,3 +37,11 @@
     data,
   })
 }
+// 获取产品的报警规则
+export function getProductAlarmRule(data: any) {
+  return request({
+    url: `/system/alarmRuleDevice/getRuleList?devCode=${data.devCode}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 751133f..16eb9c5 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -174,6 +174,10 @@
     type: Boolean,
     default: true,
   },
+  symbol: {
+    type: String,
+    default: 'none',
+  },
 })
 
 // 图表对象
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index 1d81519..293bf36 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -59,7 +59,7 @@
 <template>
   <el-dialog
     v-model="dialogFormVisible" title="" append-to-body class="warning-dialog" :show-close="false"
-    width="550px"
+    width="600px"
     :class="`${className.includes('2') ? 'grade-2' : className.includes('3') ? 'grade-3' : className.includes('1') ? 'grade-1' : 'grade-other'}`"
     :close-on-click-modal="false"
   >
@@ -68,53 +68,53 @@
     </div>
     <div class="container-dialog">
       <el-row :gutter="24" style="margin-top: 30px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmType">
           {{ info.alarmType }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           设备类型
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.typeName">
           {{ info.typeName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井位号
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagNumber">
           {{ info.tagNumber }}
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           闸井名称
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.tagName">
           {{ info.tagName }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警等级
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8" class="value" :title="info.alarmLevel">
           {{ info.alarmLevel }}
         </el-col>
-        <el-col :span="5" style="text-align: justify;text-align-last: justify;">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警值
         </el-col>
-        <el-col :span="7" style="font-size: 20px;font-weight: 700;">
+        <el-col :span="8" style="font-size: 20px;font-weight: 700;" class="value" :title="info.value">
           {{ info.value }}
           {{ info.typeName.includes('燃气') ? '%vol' : '' }}
         </el-col>
       </el-row>
       <el-row :gutter="24" style="margin-top: 15px;">
-        <el-col :span="5">
+        <el-col :span="4" style="text-align: justify;text-align-last: justify;">
           报警时间
         </el-col>
-        <el-col :span="19">
+        <el-col :span="20" class="value" :title="info.alarmTime">
           {{ info.alarmTime }}
         </el-col>
       </el-row>
@@ -227,6 +227,16 @@
 </style>
 
 <style lang="scss" scoped>
+.value {
+  overflow: hidden;
+
+  /* 确保超出的内容会被裁剪 */
+  white-space: nowrap;
+
+  /* 确保文本在一行内显示 */
+  text-overflow: ellipsis;
+}
+
 .title {
   position: absolute;
   font-size: 22px;
@@ -243,7 +253,7 @@
   // margin: 0 auto;
   // padding-left: 30px;
   color: #f1eded;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 600;
 
   .content {
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 9ed553f..7e294c3 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -86,7 +86,7 @@
   //     tagNumber: 'NX5702',
   //     alarmTime: '2024-09-09',
   //     value: '20',
-  //     typeName: '燃气智能终端',
+  //     typeName: '燃气智能终端燃气智能终端',
   //     alarmLevel: '一级',
   //   }
   //   dialogRef.value.initDialog(row)
@@ -103,19 +103,6 @@
       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/store/modules/menu.ts b/src/store/modules/menu.ts
index 3b378fd..a78f63a 100644
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -214,6 +214,10 @@
         }
         this.breadcrumbList = this.breadcrumbList.filter((item: any) => item.path !== data.path)
       },
+      // 重置
+      resetBreadcrumb() {
+        this.breadcrumbList = []
+      },
     },
   },
 )
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index afdfb1c..bd041c5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -111,6 +111,7 @@
           this.roleNames = []
           routeStore.removeRoutes()
           menuStore.setActived(0)
+          menuStore.resetBreadcrumb()
           resolve()
         })
       },
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 4fc6df3..f763f90 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -12,17 +12,18 @@
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
 // 图表数据
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
 //  列表展示列
-const columns = ref<any>([
-  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
-  { text: '信号强度', value: 'pci', align: 'center' },
-  { text: '电量(%)', value: 'cell', align: 'center' },
-  { text: '采集时间', value: 'logtime', align: 'center' },
-  { text: '上传时间', value: 'uptime', align: 'center' },
+const columns = ref<any[]>([
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center', isCustom: true },
+  { text: '信号强度', value: 'pci', align: 'center', width: 90 },
+  { text: '电量(%)', value: 'cell', align: 'center', width: 90 },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' },
+  { text: '设备状态', value: 'status', align: 'center', width: 90 },
 ])
 const listQuery = ref({
   upBegTime: '',
@@ -32,19 +33,23 @@
 })
 // 开始结束时间
 const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.upBegTime = ''
-  listQuery.value.upEndTime = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.value.upBegTime = `${newVal[0]}`
-      listQuery.value.upEndTime = `${newVal[1]}`
+watch(
+  () => datetimerange.value,
+  (newVal) => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
     }
-  }
-}, {
-  deep: true,
-  immediate: true,
-})
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
 const resizePage = () => {
   setTimeout(() => {
     const resize = new Event('resize')
@@ -55,23 +60,70 @@
   loadingTable.value = true
   listQuery.value.typeName = info.value.devTypeName
   listQuery.value.devcode = info.value.devcode
-  getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data
-    loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
-    data.value = [
-      {
-        name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength).reverse(),
-      },
-    ]
-    resizePage()
-  }).catch(() => {
-    loadingTable.value = false
-  })
+  getMonitorData(listQuery.value)
+    .then((res) => {
+      list.value = res.data.filter((item: any) => !item.alarmRuleValue)
+      // 设置设备状态和燃气浓度标红
+      const threshold = res.data.filter((item: any) => item.alarmRuleValue)[0]
+      console.log(threshold.alarmRuleValue, '阈值')
+      // 判断阈值
+      const handlerthreshold = (value: string, threshold: string[]) => {
+        if (!threshold) {
+          threshold = []
+        }
+        if (!threshold.length) {
+          return '正常'
+        }
+        else {
+          if (threshold.length === 0) {
+            return Number(value) < Number(threshold[0]) ? '报警' : '正常'
+          }
+          else {
+            return Number(value) > Number(threshold[0]) && Number(value) < Number(threshold[threshold.length - 1]) ? '正常' : '报警'
+          }
+        }
+      }
+      console.log(456)
+      list.value = list.value.map((item: any) => ({
+        ...item,
+        status: handlerthreshold(item.strength, threshold.alarmRuleValue),
+      }) as any)
+      console.log(123)
+      loadingTable.value = false
+      xAxisData.value = list.value.map((item: any) => item.logtime).reverse()
+      const markLineData = threshold.alarmRuleValue.map((item: string, index: number) => ({
+        name: `阈值${index + 1}`,
+        yAxis: Number(item),
+      }))
+      console.log('阈值线', markLineData)
+      // console.log(11111111)
+      data.value = [
+        {
+          name: '燃气浓度',
+          data: list.value.map((item: any) => item.strength).reverse(),
+          symbol: list.value.length > 1 ? 'none' : 'circle',
+          markLine: {
+            data: markLineData,
+            lineStyle: {
+              color: 'red',
+              join: 'round',
+              cap: 'round',
+              silent: true,
+            },
+          },
+        },
+      ]
+      resizePage()
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
 }
 onMounted(() => {
-  datetimerange.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+  datetimerange.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  ]
 })
 // 是否展示表格
 const isShowTable = ref(false)
@@ -99,21 +151,30 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body>
+  <el-dialog v-model="dialogFormVisible" title="查看数据" append-to-body width="900px">
     <table-container title="">
       <template #btns-left>
         <!-- 查询条件 -->
-        <div style="display: flex;align-items: center;white-space: nowrap;">
+        <div style="display: flex; align-items: center; white-space: nowrap;">
           <span style="margin-right: 5px;">采集时间: </span>
           <el-date-picker
-            v-model="datetimerange" type="datetimerange" range-separator="至" start-placeholder="采集开始时间"
-            end-placeholder="采集结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="datetimerange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
           />
           <!-- <el-date-picker
         v-model="timerang" type="datetimerange" range-separator="至" start-placeholder="上传开始时间"
         end-placeholder="上传结束时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="margin-left: 10px;"
       /> -->
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchData">
+          <el-button
+            type="primary"
+            style="margin-left: 10px;"
+            @click="fetchData"
+          >
             搜索
           </el-button>
           <el-button @click="switchView">
@@ -122,14 +183,49 @@
         </div>
       </template>
       <normal-table
-        v-show="isShowTable" :data="list" :total="0" :columns="columns" :query="{}"
-        :list-loading="loadingTable" :pagination="false"
-      />
-      <div v-show="!isShowTable" style="width: 100%;height: 240px;">
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #isCustom="{ scope, column }">
+          <!-- 设备编号 -->
+          <span
+            v-if="column.text === '燃气浓度（%LEL)'"
+            :class="scope.row.status === '报警' ? 'red' : ''"
+          >
+            {{ scope.row[column.value] }}
+          </span>
+        </template>
+      </normal-table>
+      <div v-show="!isShowTable" style="width: 100%; height: 240px;">
         <line-chart
-          v-show="xAxisData.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data"
-          :gradient="false" :smooth="false" unit="%LEL"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          v-show="xAxisData.length"
+          :loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :smooth="false"
+          unit="%LEL"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10',
+          }"
           :grid="{
             top: 50,
             left: 30,
@@ -159,4 +255,8 @@
 .el-select {
   width: 100%;
 }
+
+.red {
+  color: red;
+}
 </style>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 816a2d1..904bbcd 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -35,7 +35,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
-  { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
+  { text: '电量', value: 'cellName', align: 'center', isRequired: true, width: '70' },
   { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
@@ -85,6 +85,7 @@
       deviceTypeName: deviceTypeList.value.length ? deviceTypeList.value[deviceTypeList.value.findIndex(citem => item.deviceType === citem.value)].name : '',
       installDate: dayjs(item.installDate).format('YYYY-MM-DD'),
       bfztName: item.bfzt === '1' ? '布防' : '撤防',
+      cellName: item.cell ? Number(item.cell) < 30 ? '电量低' : '充足' : '充足',
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -349,7 +350,7 @@
         </el-select>
       </search-item>
       <search-item>
-        <el-input v-model="listQuery.keys" placeholder="安装位置" clearable />
+        <el-input v-model="listQuery.keys" placeholder="安装位号" clearable />
       </search-item>
       <search-item>
         <dept-select
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index c9ba44c..896a317 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -21,7 +21,7 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '运维类型', value: 'repairType', align: 'center', width: '110' },
   { text: '安装位号', value: 'ledgerNumber', align: 'center' },
-  { text: '详细位置', value: 'position', align: 'center' },
+  { text: '详细地址', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
   { text: '运维内容', value: 'repairContent', align: 'center' },
   { text: '运维人员', value: 'repairPerson', align: 'center', width: '120' },
@@ -45,6 +45,7 @@
   repairContent: '', // 运维内容
   endTime: '', // 结束时间
   begTime: '', // 开始时间
+  address: '', // 安装位置
 })
 // 开始结束时间
 const datetimerange = ref()
@@ -86,6 +87,7 @@
     repairContent: '', // 运维内容
     endTime: '', // 结束时间
     begTime: '', // 开始时间
+    address: '', // 安装位置
   }
   fetchData()
 }
@@ -170,6 +172,9 @@
         <el-input v-model="listQuery.repairPerson" placeholder="运维人员" clearable />
       </search-item>
       <search-item>
+        <el-input v-model="listQuery.address" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index c44d4da..e62199c 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,13 +25,13 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center' },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
-  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '130', isCustom: true },
+  { text: '报警提示方式', value: 'alarmNoteMethodName', align: 'center', width: '240', isCustom: true },
   { text: '状态', value: 'stateName', align: 'center', width: '100', isCustom: true },
   { text: '更新时间', value: 'ts', align: 'center', width: '110' },
 ])
@@ -64,6 +64,7 @@
       stateName: item.state === '1' ? '启用' : '未启用',
       alarmNoteMethodName: item.alarmNoteMethod === '1' ? '弹窗' : '消息提醒',
       ts: item.ts ? dayjs(item.ts).format('YYYY-MM-DD') : '',
+      alarmNote: item.alarmNote.split(','),
     }))
     total.value = res.data.total
     loadingTable.value = false
@@ -290,8 +291,18 @@
         <template #isCustom="{ scope, column }">
           <!-- 报警提示方式 -->
           <span v-if="column.text === '报警提示方式'">
-            <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
-            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag>
+            <!-- <el-tag v-if="scope.row.alarmNoteMethodName === '消息提醒'" type="primary">消息提醒</el-tag>
+            <el-tag v-if="scope.row.alarmNoteMethodName === '弹窗'" type="danger">弹窗提醒</el-tag> -->
+            <el-tag
+              v-for="item in scope.row.alarmNote"
+              v-show="item"
+              :key="item"
+              :type="item === '消息提醒' ? 'primary'
+                : item === '弹窗提醒' ? 'danger'
+                  : item === '报警音效' ? 'success' : 'info'
+              "
+              style="margin-left: 5px;"
+            >{{ item }}</el-tag>
           </span>
           <!-- 报警提示方式 -->
           <span v-if="column.text === '状态'">
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index d46453d..c1b9c9d 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -8,8 +8,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
-import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
-import { addSpecialAlarmRule, editSpecialAlarmRule } from '@/api/home/rule/special'
+import {
+  getAlarmLevelListPage,
+  getAlarmTypeListPage,
+} from '@/api/home/rule/alarm'
+import {
+  addSpecialAlarmRule,
+  editSpecialAlarmRule,
+  getProductAlarmRule,
+} from '@/api/home/rule/special'
 import { getDeviceListPage } from '@/api/home/device/device'
 import { getProductListPage } from '@/api/home/device/product'
 import { useCheckList } from '@/utils/useCheckList'
@@ -38,7 +45,9 @@
   detail: '',
 } // 表头显示标题
 const rules: FormRules = {
-  devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+  devcode: [
+    { required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] },
+  ],
 } // 前端校验规则
 
 // 重置表单
@@ -57,28 +66,57 @@
 }
 const list = ref<any[]>([])
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmTypeId', align: 'center', type: 'select', code: 'alarm-rule', required: true },
-  { text: '报警等级', value: 'alarmLevelId', align: 'center', type: 'select', code: 'alarm-level', required: true },
-  { text: '报警阈值', value: 'alarmThreshold', align: 'center', type: 'input', required: true },
+  {
+    text: '报警类型',
+    value: 'alarmTypeId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-rule',
+    required: true,
+  },
+  {
+    text: '报警等级',
+    value: 'alarmLevelId',
+    align: 'center',
+    type: 'select',
+    code: 'alarm-level',
+    required: true,
+  },
+  {
+    text: '报警阈值',
+    value: 'alarmThreshold',
+    align: 'center',
+    type: 'input',
+    required: true,
+  },
 ])
 // 初始化对话框
 const isFirst = ref(true)
+// 初始数据
+const initDeviceCode = ref('')
+const initAlarmRule = ref<any[]>([])
 const initDialog = (dialogStatusValue: string, row: any) => {
   dialogStatus.value = dialogStatusValue
   isFirst.value = true
   dialogFormVisible.value = true
-  if (dialogStatus.value === 'create') { // 如果是新增，清除验证
+  if (dialogStatus.value === 'create') {
+    // 如果是新增，清除验证
     resetForm()
     // nextTick(() => {
     //   dataFormRef.value.clearValidate()
     // })
     dataFormRef.value?.resetFields()
     list.value = []
+    initDeviceCode.value = ''
+    initAlarmRule.value = []
   }
-  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
+  else if (dialogStatus.value === 'edit' || dialogStatus.value === 'detail') {
+    // 如果是修改，将row中数据填写到输入框中
     dataForm.value = {
       ...JSON.parse(JSON.stringify(row)),
     }
+    initDeviceCode.value = dataForm.value.devcode
+    console.log(row, '123')
     list.value = [
       {
         edit: dialogStatus.value === 'edit',
@@ -86,13 +124,41 @@
         alarmLevelId: row.alarmLevelId,
         alarmThreshold: row.alarmThreshold,
         alarmTypeId: row.alarmTypeId,
+        isConcentration: row.alarmType.includes('浓度'),
       },
     ]
+    initAlarmRule.value = JSON.parse(JSON.stringify(list.value))
   }
   setTimeout(() => {
     isFirst.value = false
   })
 }
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      console.log(newVal, isFirst.value, '设备编号')
+      if (!isFirst.value) {
+        if (newVal !== initDeviceCode.value) {
+          getProductAlarmRule({ devCode: newVal }).then((res) => {
+            console.log(res.data, '报警规则')
+            list.value = res.data.map((item: any) => ({
+              edit: true,
+              alarmTypeId: item.alarmTypeId,
+              alarmThreshold: item.alarmThreshold,
+              alarmLevelId: item.alarmLevelId,
+              alarmRule: '',
+              isConcentration: item.alarmTypeName.includes('浓度'),
+            }))
+          })
+        }
+        else {
+          list.value = JSON.parse(JSON.stringify(initAlarmRule.value))
+        }
+      }
+    }
+  },
+)
 defineExpose({
   initDialog,
 })
@@ -103,20 +169,23 @@
     if (valid) {
       // 验证数据列
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        addSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '添加成功',
-              type: 'success',
-            })
-            // 通知父组件刷新状态
-            dialogFormVisible.value = false
-            setTimeout(() => {
-              emits('refresh')
-            })
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        addSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '添加成功',
+                type: 'success',
+              })
+              // 通知父组件刷新状态
+              dialogFormVisible.value = false
+              setTimeout(() => {
+                emits('refresh')
+              })
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -127,19 +196,22 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       if (useCheckList(list.value, columns.value, '报警规则')) {
-        editSpecialAlarmRule(data).then((response) => {
-          if (response.code === 200) {
-            ElMessage({
-              message: '修改成功',
-              type: 'success',
-            })
-            setTimeout(() => {
-              emits('refresh')
-            })
-            dialogFormVisible.value = false
-          }
-        }).catch((_) => { // 异常情况，loading置为false
-        })
+        editSpecialAlarmRule(data)
+          .then((response) => {
+            if (response.code === 200) {
+              ElMessage({
+                message: '修改成功',
+                type: 'success',
+              })
+              setTimeout(() => {
+                emits('refresh')
+              })
+              dialogFormVisible.value = false
+            }
+          })
+          .catch((_) => {
+            // 异常情况，loading置为false
+          })
       }
     }
   })
@@ -147,17 +219,28 @@
 
 // 保存数据
 const saveData = () => {
+  if (!list.value.length) {
+    ElMessage.warning('报警规则为空')
+    return
+  }
+  if (list.value.filter((item: any) => item.edit).length) {
+    ElMessage.warning('请先保存报警规则')
+    return
+  }
   const data = list.value.map((item: any) => ({
     alarmLevelId: item.alarmLevelId,
     alarmTypeId: item.alarmTypeId,
     alarmRule: item.alarmRule,
-    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]:${item.alarmThreshold}%LEL`,
+    alarmRuleName: `${alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || ''}[${alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevelId)[0]?.name || ''}]${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? ':' : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? item.alarmThreshold : ''}${(alarmRuleList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.name || '').includes('浓度') ? '%LEL' : ''}`,
     alarmThreshold: item.alarmThreshold,
     devcode: dataForm.value.devcode,
     id: dataForm.value.id,
     position: dataForm.value.position,
     tagNumber: dataForm.value.tagNumber,
-    devTypeName: deviceList.value.filter((citem: any) => citem.value === dataForm.value.devcode)[0]?.name || '',
+    devTypeName:
+      deviceList.value.filter(
+        (citem: any) => citem.value === dataForm.value.devcode,
+      )[0]?.name || '',
     // alarmTypeId: alarmRuleList.value.filter((citem: any) => citem.name === item.alarmRule)[0]?.alarmTypeId || '',
   }))
   if (dialogStatus.value === 'edit') {
@@ -182,7 +265,7 @@
 // 保存行
 const saveRow = (scope: any) => {
   const row = scope.row as any
-  if (String(row.alarmThreshold) && row.alarmLevelId && row.alarmRule) {
+  if (String(row.alarmThreshold) && row.alarmLevelId) {
     list.value[scope.$index].edit = false
   }
   else {
@@ -195,15 +278,11 @@
 }
 // 删除行
 const removeRow = (scope: any) => {
-  ElMessageBox.confirm(
-    '确定要删除该数据吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
+  ElMessageBox.confirm('确定要删除该数据吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
     list.value = list.value.filter((item, index) => index !== scope.$index)
     ElMessage.success('操作成功')
   })
@@ -213,14 +292,16 @@
 const fetchDict = () => {
   // 设备列表
   getDeviceListPage({ offset: 1, limit: 9999 }).then((res) => {
-    deviceList.value = res.data.rows.map((item: any) => ({
-      name: item.typeName,
-      id: item.id,
-      value: item.devcode,
-      productId: item.productId,
-      position: item.position,
-      tagNumber: item.tagNumber,
-    })).filter((item: any) => item.productId && item.value)
+    deviceList.value = res.data.rows
+      .map((item: any) => ({
+        name: item.typeName,
+        id: item.id,
+        value: item.devcode,
+        productId: item.productId,
+        position: item.position,
+        tagNumber: item.tagNumber,
+      }))
+      .filter((item: any) => item.productId && item.value)
     // 产品
     getProductListPage({ limit: 9999, offset: 1 }).then((res) => {
       productList.value = res.data.rows.map((item: any) => ({
@@ -251,57 +332,110 @@
 fetchDict()
 
 // 监听设备编号，自动填充产品，安装位号，详细地址
-watch(() => dataForm.value.devcode, (newVal) => {
-  if (newVal) {
-    const current = deviceList.value.filter((item: any) => item.value === dataForm.value.devcode)
-    console.log(current, 'current')
-    if (current.length) {
-      dataForm.value.productId = current[0].productId
-      dataForm.value.tagNumber = current[0].tagNumber
-      dataForm.value.position = current[0].position
-      // 根据设备类型寻找报警类型
-      getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
-        alarmRuleList.value = res.data.rows.filter((item: any) => item.deviceTypeName.includes(current[0].name)).map((item: any) => ({
-          name: item.alarmType,
-          id: item.id,
-          value: item.id,
-          // alarmTypeId: item.id,
-        }))
-      })
+watch(
+  () => dataForm.value.devcode,
+  (newVal) => {
+    if (newVal) {
+      const current = deviceList.value.filter(
+        (item: any) => item.value === dataForm.value.devcode,
+      )
+      console.log(current, 'current')
+      if (current.length) {
+        dataForm.value.productId = current[0].productId
+        dataForm.value.tagNumber = current[0].tagNumber
+        dataForm.value.position = current[0].position
+        // 根据设备类型寻找报警类型
+        getAlarmTypeListPage({ limit: 9999, offset: 1 }).then((res) => {
+          alarmRuleList.value = res.data.rows
+            .filter((item: any) =>
+              item.deviceTypeName.includes(current[0].name),
+            )
+            .map((item: any) => ({
+              name: item.alarmType,
+              id: item.id,
+              value: item.id,
+              // alarmTypeId: item.id,
+            }))
+        })
+      }
+      if (isFirst.value) {
+        return
+      }
+      alarmRuleList.value = []
+      list.value = []
     }
-    if (isFirst.value) {
-      return
-    }
-    alarmRuleList.value = []
-    list.value = []
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+)
+// 改变报警类型
+const changeAlarmType = (value: string, index: number) => {
+  console.log(value, index, 'valuevaluevalue')
+  // alarmRuleList
+  const alarmTypeName
+    = alarmRuleList.value.filter(item => item.id === value)[0]?.name || ''
+  console.log(alarmTypeName, 'alarmTypeName')
+  if (alarmTypeName.includes('浓度')) {
+    list.value[index].isConcentration = true
   }
-}, {
-  deep: true,
-  immediate: true,
-})
+  else {
+    list.value[index].isConcentration = false
+  }
+}
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}特殊报警规则`" append-to-body width="900px">
+  <el-dialog
+    v-model="dialogFormVisible"
+    :title="`${textMap[dialogStatus]}特殊报警规则`"
+    append-to-body
+    width="900px"
+  >
     <el-form
-      ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right"
-      :disabled="dialogStatus === 'detail'" label-width="110px"
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-position="right"
+      :disabled="dialogStatus === 'detail'"
+      label-width="110px"
     >
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
-            <el-select v-model.trim="dataForm.devcode" placeholder="设备编号" style="width: 100%;" clearable filterable>
-              <el-option v-for="item in deviceList" :key="item.id" :label="item.value" :value="item.value" />
+            <el-select
+              v-model.trim="dataForm.devcode"
+              placeholder="设备编号"
+              style="width: 100%;"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品" prop="productId">
             <el-select
-              v-model.trim="dataForm.productId" placeholder="产品" style="width: 100%;" clearable filterable
+              v-model.trim="dataForm.productId"
+              placeholder="产品"
+              style="width: 100%;"
+              clearable
+              filterable
               disabled
             >
-              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -310,7 +444,11 @@
         <el-col :span="12">
           <el-form-item label="安装位号" prop="tagNumber">
             <el-input
-              v-model.trim="dataForm.tagNumber" type="text" placeholder="安装位号" style="width: 100%;" disabled
+              v-model.trim="dataForm.tagNumber"
+              type="text"
+              placeholder="安装位号"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -318,7 +456,11 @@
         <el-col :span="12">
           <el-form-item label="详细地址" prop="position">
             <el-input
-              v-model.trim="dataForm.position" type="text" placeholder="详细地址" style="width: 100%;" disabled
+              v-model.trim="dataForm.position"
+              type="text"
+              placeholder="详细地址"
+              style="width: 100%;"
+              disabled
               clearable
             />
           </el-form-item>
@@ -335,14 +477,20 @@
             <table-container title="报警规则">
               <template #btns-right>
                 <!-- 操作 -->
-                <div>
+                <!-- <div>
                   <el-button v-if="dialogStatus === 'create'" type="primary" @click="addRow">
                     新增
                   </el-button>
-                </div>
+                </div> -->
               </template>
               <!-- 查询结果Table显示 -->
-              <normal-table :data="list" :total="0" :columns="[]" :query="{}" :pagination="false">
+              <normal-table
+                :data="list"
+                :total="0"
+                :columns="[]"
+                :query="{}"
+                :pagination="false"
+              >
                 <template #preColumns>
                   <el-table-column label="序号" width="55" align="center">
                     <template #default="scope">
@@ -351,28 +499,61 @@
                   </el-table-column>
                 </template>
                 <template #columns>
-                  <el-table-column v-for="item in columns" :key="item.text" :label="item.text" align="center">
+                  <el-table-column
+                    v-for="item in columns"
+                    :key="item.text"
+                    :label="item.text"
+                    align="center"
+                  >
                     <template #default="scope">
                       <!-- 报警规则 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-rule'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-rule'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警类型" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警类型"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
+                          @change="
+                            () => {
+                              changeAlarmType(
+                                scope.row[item.value],
+                                scope.$index,
+                              )
+                            }
+                          "
                         >
                           <el-option
-                            v-for="item in alarmRuleList" :key="item.id" :label="item.name"
+                            v-for="item in alarmRuleList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.id"
                           />
                         </el-select>
                       </template>
                       <!-- 报警等级 -->
-                      <template v-if="item.type === 'select' && item.code === 'alarm-level'">
+                      <template
+                        v-if="
+                          item.type === 'select' && item.code === 'alarm-level'
+                        "
+                      >
                         <el-select
-                          v-model.trim="scope.row[item.value]" placeholder="报警等级" style="width: 100%;"
-                          clearable filterable :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警等级"
+                          style="width: 100%;"
+                          clearable
+                          filterable
+                          :disabled="!scope.row.edit"
                         >
                           <el-option
-                            v-for="item in alarmLevelList" :key="item.id" :label="item.name"
+                            v-for="item in alarmLevelList"
+                            :key="item.id"
+                            :label="item.name"
                             :value="item.value"
                           />
                         </el-select>
@@ -380,29 +561,49 @@
                       <!-- 报警阈值 -->
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input
-                          v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
-                          style="width: 60%;" :disabled="!scope.row.edit"
+                          v-model.trim="scope.row[item.value]"
+                          placeholder="报警阈值"
+                          clearable
+                          type="number"
+                          style="width: 60%;"
+                          :disabled="
+                            !scope.row.edit || !scope.row.isConcentration
+                          "
                         />
                         <span>%LEL</span>
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column v-if="dialogStatus === 'create'" label="操作" width="140" align="center">
+                  <el-table-column
+                    v-if="dialogStatus === 'create' || dialogStatus === 'edit'"
+                    label="操作"
+                    width="140"
+                    align="center"
+                  >
                     <template #default="scope">
                       <el-button
-                        v-if="scope.row.edit === true" type="primary" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="primary"
+                        link
+                        size="small"
                         @click="saveRow(scope)"
                       >
                         保存
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === false" type="primary" link size="small"
+                        v-if="scope.row.edit === false"
+                        type="primary"
+                        link
+                        size="small"
                         @click="editRow(scope)"
                       >
                         编辑
                       </el-button>
                       <el-button
-                        v-if="scope.row.edit === true" type="danger" link size="small"
+                        v-if="scope.row.edit === true"
+                        type="danger"
+                        link
+                        size="small"
                         @click="removeRow(scope)"
                       >
                         删除
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index d028564..73c1336 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -139,7 +139,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="70" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 185403c..4e4b732 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -76,8 +76,8 @@
     align: 'center',
   },
   {
-    text: '运行状态',
-    value: 'validName',
+    text: '监控状态',
+    value: 'monitorStateName',
     align: 'center',
   },
   {
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index 68598b9..0e47d63 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -260,7 +260,7 @@
       </div>
       <div v-for="item in gasData" :key="item.name" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item.devcode)">{{ item.devcode }}</span>
-        <span style="margin-left: 10px;width: 38%;display: inline-block;">{{ item.name }}</span>
+        <span style="margin-left: 10px;width: 38%;display: inline-block; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="item.name">{{ item.name }}</span>
         <span
           :class="item.state === '1' ? 'normal' : item.state === '0' ? 'offline' : item.state === '2' ? 'error' : ''"
           style="margin-left: 10px;"
diff --git a/src/views/login-pc.vue b/src/views/login-pc.vue
index 4cb3c1a..b36317d 100644
--- a/src/views/login-pc.vue
+++ b/src/views/login-pc.vue
@@ -12,7 +12,7 @@
 import { RSAencrypt } from '@/utils/security'
 const route = useRoute()
 const router = useRouter()
-
+const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 
 const banner = new URL('../assets/images/login-banner.png', import.meta.url)
@@ -190,6 +190,10 @@
   loginForm.value.username = localStorage.login_username_bjwell || ''
   getBaseConfig()
 })
+onMounted(() => {
+  proxy.pauseAudio()
+  localStorage.setItem('eventAudio', 'pause')
+})
 </script>
 
 <template>