From b1f5cfdd7ae61e50a262526fb0fee2f26abd3537 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Sat, 20 Sep 2025 15:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/equipmentAlarmRecord/types.ts    |  1 +
 src/views/equipmentAlarmRecord/index.vue | 18 +++++++++++-------
 src/views/index.vue                      | 19 ++++++++++---------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/api/equipmentAlarmRecord/types.ts b/src/api/equipmentAlarmRecord/types.ts
index 74493a9..7dc85f0 100644
--- a/src/api/equipmentAlarmRecord/types.ts
+++ b/src/api/equipmentAlarmRecord/types.ts
@@ -16,6 +16,7 @@ export interface AlarmVO {
   deviceMac: string;
   devicePic:string;
   finishTime: string;
+  timeDiff:string
   
 }
 
diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index 369fb26..2321232 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -89,16 +89,16 @@
                 <div class="label">报警事项</div>
                 <div class="alearm">
                   <template v-if="item.deviceAction === 0">强制报警
-                    <span v-if="item.treatmentState === 1">({{ item.timeDiff}})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 1">撞击闯入
-                    <span v-if="item.treatmentState === 1">({{ item.timeDiff}})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 2">自动报警
-                    <span v-if="item.treatmentState === 1">({{ item.timeDiff}})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 3">电子围栏告警
-                    <span v-if="item.treatmentState === 1">({{ item.timeDiff}})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                 </div>
                 <div class="label">报警地点</div>
@@ -141,7 +141,7 @@
             <template #default="scope">
               <div class="ysStatus" v-if="scope.row.treatmentState == 0">已处理</div>
               <el-tag type="danger" v-if="scope.row.treatmentState == 1">未处理</el-tag>
-              
+
             </template>
           </el-table-column>
           <el-table-column label="报警时间" align="center" prop="startTime" />
@@ -223,10 +223,10 @@ const getList = async () => {
   };
   const res = await listAlarm(queryParams.value);
   if (res.rows) {
-     // 先清除已有定时器
+    // 先清除已有定时器
     clearAllTimers();
     //alarmList.value = res.rows;
-     // 为每个项添加timeDiff属性并初始化
+    // 为每个项添加timeDiff属性并初始化
     alarmList.value = res.rows.map(item => ({
       ...item,
       timeDiff: '' // 用于存储计算出的时间差
@@ -307,6 +307,10 @@ onMounted(() => {
   getList();
   getDeviceType()
 });
+// 组件卸载时清除所有定时器
+onUnmounted(() => {
+  clearAllTimers();
+});
 </script>
 <style lang="scss" scoped>
 :deep .el-collapse {
diff --git a/src/views/index.vue b/src/views/index.vue
index b87a8b5..75325ce 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -326,7 +326,7 @@ const initAlarmRingChart = async () => {
               },
               textStyle: {
                 color: 'rgba(56, 64, 79, 0.6)', // 文字颜色（可自定义）
-                fontSize: 12,     // 文字字号
+                fontSize: 14,     // 文字字号
                 lineHeight: 20    // 文字行高
               }
             },
@@ -338,15 +338,16 @@ const initAlarmRingChart = async () => {
             show: false // 隐藏标签连接线
           },
           data: [
-            {
-              value: processingAlarmToday,
-              name: '报警',
-              itemStyle: { color: '#F65757' } // 红色：未处理
-            },
-            {
-              value: alarmsTotalToday,
+         
+            {  
+              value:processingAlarmToday ,
               name: '已处理',
-              itemStyle: { color: '#07BE75' } // 绿色：已处理
+              itemStyle: { color: '#07BE75' }
+            },
+               {
+              value: alarmsTotalToday,
+              name: '报警',
+              itemStyle: { color: '#F65757' }
             },
 
           ]