修改告警详情中的告警值 显示逻辑； 解决 是否保安证 勾选 否 没有清空图片的问题

src/views/system/dept/extend.vue

@@ -841,13 +841,21 @@ export default {
       }
     },
     askari(newValue){
+      console.log("askari1",newValue)
       if (newValue==0){
+        console.log("askari2",newValue)
         this.innerCount=null;
         this.outsideCount=null;
         this.isAskariCertificate=null;
         this.askariCertificate=null;
       }
     },
+    isAskariCertificate(newValue)
+    {
+      if(!newValue){
+        this.askariCertificate=null;
+      }
+    }
   },
 
   created() {

src/views/warn/dialog.dealAlarm.vue

@@ -7,7 +7,7 @@
       width="800px"
     >
       <div class="page-body">
-        <el-descriptions class="margin-top" :column="2" size="medium" border :label-style="labelStyle" :contentStyle="content_style">
+        <el-descriptions class="margin-top" :column="2" size="medium" border :label-style="labelStyle">
         <el-descriptions-item labelClassName="gx_info_label" label="机构名称">
           {{alarmData.orgName}}
         </el-descriptions-item>
@@ -24,7 +24,7 @@
           {{alarmData.endTime}}
         </el-descriptions-item>
         <el-descriptions-item labelClassName="gx_info_label" label="告警值" >
-          {{alarmData.alarmValue}}
+          {{valueText()}}
         </el-descriptions-item>
         <el-descriptions-item labelClassName="gx_info_label" label="告警内容" >
           {{alarmData.content}}
@@ -129,7 +129,13 @@ export default {
         if (!this.alarmData || this.alarmData.valueText == null) {
           return ''
         }
-        return `${this.alarmData.valueText}${this.alarmData.alarmValue ? this.alarmData.alarmValue : ''}`
+        if(this.alarmData.alarmValue && (this.alarmData.alarmValue.includes("°C") || this.alarmData.alarmValue.includes("%RH") ))
+        {
+          return this.alarmData.alarmValue;
+        }
+        else{
+          return this.alarmData.valueText
+        }
       },
     dataTypeText() {
       if (!this.alarmData || this.alarmData.dataType == null) {

src/views/warn/dialog.info.vue

@@ -20,7 +20,7 @@
             {{formData.endTime}}
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警值" >
-            {{formData.alarmValue}}
+            {{valueText()}}
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警内容" >
             {{formData.content}}
@@ -32,7 +32,7 @@
             {{formData.doByUser}}
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="处置类型" >
-            {{ getLabel(dict.type.alarm_deal_type, formData.doType, "未知")}}
+            {{ getLabel(dict.type.alarm_deal_type, formData.doType, "")}}
           </el-descriptions-item>
           <el-descriptions-item span="2" labelClassName="gx_info_label" label="处置内容" >
             {{formData.doContent}}
@@ -108,6 +108,14 @@
           return ''
         }
 
+        if(this.formData.alarmValue && (this.formData.alarmValue.includes("°C") || this.formData.alarmValue.includes("%RH") ))
+        {
+          return this.formData.alarmValue;
+        }
+        else{
+          return this.formData.valueText
+        }
+
         return `${this.formData.valueText}${this.formData.alarmValue ? this.formData.alarmValue : ''}`
       },
       dataTypeText() {