瀏覽代碼

修改告警详情中的告警值 显示逻辑

zhulu 1 年之前
父節點
當前提交
8c60e3f09d
共有 2 個文件被更改,包括 16 次插入5 次删除
  1. 8 3
      src/views/menu/iot/alarmCenter/dealAlarm.vue
  2. 8 2
      src/views/menu/iot/alarmCenter/detail.vue

+ 8 - 3
src/views/menu/iot/alarmCenter/dealAlarm.vue

@@ -14,7 +14,7 @@
       <van-cell title="告警开始时间" :value="renderTime(info.time)"></van-cell>
       <van-cell title="告警结束时间" :value="renderTime(info.endTime)"></van-cell>
       <van-cell title="持续时长" :value="durationText" />
-      <van-cell title="告警值" :value="info.alarmValue" />
+      <van-cell title="告警值" :value="valueText" />
       <van-cell title="告警内容" :value="info.content" />
     
       <!-- <van-cell title="处置时间" :value="renderTime(info.doTime)" /> -->
@@ -103,8 +103,13 @@ export default {
       if (!this.info || this.info.valueText == null) {
         return ''
       }
-
-      return `${this.info.valueText}${this.info.alarmValue ? this.info.alarmValue : ''}`
+      if(this.info.alarmValue && (this.info.alarmValue.includes("°C") || this.info.alarmValue.includes("%RH") ))
+        {
+          return this.info.alarmValue;
+        }
+        else{
+          return this.info.valueText
+        }
     }
   },
   mounted() {

+ 8 - 2
src/views/menu/iot/alarmCenter/detail.vue

@@ -14,7 +14,7 @@
       <van-cell title="告警开始时间" :value="renderTime(info.time)"></van-cell>
       <van-cell title="告警结束时间" :value="renderTime(info.endTime)"></van-cell>
       <van-cell title="持续时长" :value="durationText" />
-      <van-cell title="告警值" :value="info.alarmValue" />
+      <van-cell title="告警值" :value="valueText" />
       <van-cell title="告警内容" :value="info.content" />
       <van-cell title="处置时间" :value="renderTime(info.doTime)" />
       <van-cell title="处置人" :value="info.doByUser" />
@@ -74,7 +74,13 @@ export default {
         return ''
       }
 
-      return `${this.info.valueText}${this.info.alarmValue ? this.info.alarmValue : ''}`
+      if(this.info.alarmValue && (this.info.alarmValue.includes("°C") || this.info.alarmValue.includes("%RH") ))
+        {
+          return this.info.alarmValue;
+        }
+        else{
+          return this.info.valueText
+        }
     }
   },
   mounted() {