From b684831e780f222ffee486e823d81f1bb58e3e1e Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Fri, 18 Aug 2023 11:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8B=E6=8B=89=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=83=BD=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysisMonitor/alarmHistory/index.vue    | 54 ++++---------------
 .../analysisMonitor/alarmRules/index.vue      |  4 +-
 2 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
index 3e7ceaa..2177b1f 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue
@@ -217,56 +217,20 @@ const columns = [{
 const columns_info = [{
     title: 'NUCLIDE',
     align: 'left',
-    dataIndex: 'nuclide'
+    dataIndex: 'nuclide',
+    width:200
   },{
     title: 'THRESHOLD ',
     align: 'left',
-    dataIndex: 'threshold'
+    dataIndex: 'threshold',
+    width:200
   },{
-    title: 'ARMDARR',
+    title: 'VALUE ',
     align: 'left',
-    dataIndex: 'ARMDARR',
-    customRender: (val) => {
-      if(!val){
-        return "--"
-      } else{
-        return val
-      }
-    }
-  },{
-    title: 'ARMDRRR',
-    align: 'left',
-    dataIndex: 'ARMDRRR',
-    customRender: (val) => {
-      if(!val){
-        return "--"
-      } else{
-        return val
-      }
-    }
-  },{
-    title: 'IDCARR',
-    align: 'left',
-    dataIndex: 'IDCARR',
-    customRender: (val) => {
-      if(!val){
-        return "--"
-      } else{
-        return val
-      }
-    }
-  },{
-    title: 'IDCRRR',
-    align: 'left',
-    dataIndex: 'IDCRRR',
-    customRender: (val) => {
-      if(!val){
-        return "--"
-      } else{
-        return val
-      }
-    }
-  }
+    dataIndex: 'value',
+    width:200
+  },
+  
 ]
 export default {
   components: {
diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
index 6aad4f0..2f3647a 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
@@ -19,6 +19,7 @@
             :maxTagCount="1" 
             :filter-option="filterOption"
             show-arrow 
+            allowClear
             :options="stationOptions" 
             @change="onStationChange"
           >
@@ -33,7 +34,7 @@
             dictCode="alarm_analyse_rule_source"
           />
         </a-col>
-        <a-col flex="265px">
+        <a-col flex="275px">
           <span class="item-label">Nuclide</span>
           <a-select style="width:180px"
             v-model="queryParams.nuclide" 
@@ -42,6 +43,7 @@
             :maxTagCount="1" 
             :filter-option="filterOption"
             show-arrow 
+            allowClear
             :options="nuclideOptions" 
             @change="onNuclideChange"
           >