From d7cb2831219ea7570be7c1c4402bc95a5fca322d Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 10 Jan 2025 14:17:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9Nuclide=E4=B8=BA?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A8=E9=80=89=E7=9A=84=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9Identify=20nuclides?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomSelectWithAllChecking.vue/index.vue |  1 -
 .../analysisMonitor/alarmRules/index.vue      | 25 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/CustomSelectWithAllChecking.vue/index.vue b/src/components/CustomSelectWithAllChecking.vue/index.vue
index a90170e..adb0cca 100644
--- a/src/components/CustomSelectWithAllChecking.vue/index.vue
+++ b/src/components/CustomSelectWithAllChecking.vue/index.vue
@@ -18,7 +18,6 @@ export default {
   props: {
     value: {
       type: [Array, Number],
-      default: () => [],
     },
     options: {
       type: Array,
diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
index 9f025e9..087f29d 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
@@ -214,7 +214,7 @@
           prop="station"
           :rules="[{ required: true, message: 'Please select station!' }]"
         >
-          <a-select
+          <!-- <a-select
             class="form-select"
             mode="multiple"
             placeholder="select..."
@@ -224,7 +224,16 @@
             v-model="formVal.station"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
-          </a-select>
+          </a-select> -->
+          <custom-select-with-all-checking
+            class="form-select"
+            placeholder="select..."
+            :options="filteredStationList"
+            :filter-option="filterOption"
+            :max-tag-count="1"
+            v-model="formVal.station"
+          >
+          </custom-select-with-all-checking>
         </a-form-model-item>
         <a-form-model-item
           label="Nuclide"
@@ -320,11 +329,7 @@
           </dic-select>
         </a-form-model-item>
 
-        <a-form-model-item
-          label="Identify nuclides"
-          prop="identifyNuclides"
-          :rules="[{ required: true, message: 'Please select Identify nuclides!' }]"
-        >
+        <a-form-model-item label="Identify nuclides" prop="identifyNuclides">
           <a-select
             class="form-select"
             mode="multiple"
@@ -375,6 +380,7 @@ import { getAction, postAction, httpAction, deleteAction, putAction } from '@/ap
 import DicSelect from '../../components/dicSelect.vue'
 import { MenuNameMap, QcFlagOptions, SampleMap, SampleTypeOptions } from './config'
 import { cloneDeep } from 'lodash'
+import CustomSelectWithAllChecking from '@/components/CustomSelectWithAllChecking.vue'
 
 const InitialFormVal = {
   name: '',
@@ -397,6 +403,7 @@ const InitialFormVal = {
 export default {
   components: {
     DicSelect,
+    CustomSelectWithAllChecking,
   },
   data() {
     return {
@@ -583,7 +590,7 @@ export default {
             colTime: colTime ? (colTime.length > 1 ? colTime : colTime[0]) : null,
             xe133MDC: xe133MDC ? (xe133MDC.length > 1 ? xe133MDC : xe133MDC[0]) : null,
 
-            identifyNuclides: identifyNuclidesChecked,
+            identifyNuclides: identifyNuclidesChecked || null,
             station: stationChecked,
             nuclide: nuclidesChecked,
 
@@ -704,7 +711,7 @@ export default {
           conditions: condition,
           stations: station.join(','),
           nuclides: nuclide.join(','),
-          identifyNuclides: identifyNuclides.join(','),
+          identifyNuclides: identifyNuclides && identifyNuclides.length ? identifyNuclides.join(',') : null,
           ...qcFlags,
         }
         if (this.isAdd) {