ce

src/views/home/yuxin.vue

@@ -633,16 +633,11 @@
               }"
             >
               <span class="alarm-text">
-                <div
-                  v-if="
-                    item.alarmLogStatusDTO && item.alarmLogStatusDTO?.deviceData
-                  "
-                >
+                <div v-if="sxyw.alarm && sxyw.alarm?.deviceData">
                   <div
-                    v-for="(item, index) in JSON.parse(
-                      item.alarmLogStatusDTO?.deviceData
-                    ).filter((val) =>
-                      evalFn(val.value + val.operator + val.thresholdValue)
+                    v-for="(item, index) in sxyw.alarm?.deviceData.filter(
+                      (val) =>
+                        evalFn(val.value + val.operator + val.thresholdValue)
                     )"
                     :key="index"
                   >
@@ -654,7 +649,7 @@
               </span>
               <img
                 class="alarm-icon"
-                :src="getAlarmSrc(item.alarmLogStatusDTO?.alarmId)"
+                :src="getAlarmSrc(sxyw.alarm?.alarmLevel)"
                 alt="alarm"
               />
             </div>
@@ -1455,6 +1450,8 @@
         devices.forEach((key) => {
           this.getDeviceData(key);
           ids.push(this[key].deviceId[this.currentId]);
+          this[key].alarm.alarmLevel = '';
+          this[key].alarm.deviceData = [];
         });
         if (ids.length) {
           //获取告警