From 80b35bef867dcbcea80e161ae2bc53faf06a85d4 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 3 Jan 2025 17:56:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0Avg=20cycle=E5=92=8CI?=
 =?UTF-8?q?dentify=20nuclides=E5=B1=9E=E6=80=A7=EF=BC=8CStation=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysisMonitor/alarmRules/index.vue      | 75 ++++++++++++++++---
 .../analysisMonitor/avgNuclide/index.vue      |  1 +
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
index f4a3f48..be1d652 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue
@@ -244,13 +244,34 @@
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
           </a-select>
         </a-form-model-item>
-        <a-form-model-item
-          label="Coefficient"
-          prop="coefficient"
-          :rules="[{ required: true, message: 'Please input coefficient!' }]"
-        >
-          <a-input type="number" v-model="formVal.coefficient"></a-input>
-        </a-form-model-item>
+
+        <a-row :gutter="10">
+          <a-col :span="12">
+            <a-form-model-item
+              label="Avg cycle"
+              prop="days"
+              :rules="[{ required: true, message: 'Please input Avg cycle!' }]"
+              :label-col="{ span: 8 }"
+              :wrapper-col="{ span: 16 }"
+            >
+              <a-input class="avg-cycle" type="number" v-model="formVal.days">
+                <template #suffix>days</template>
+              </a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item
+              label="Coefficient"
+              prop="coefficient"
+              :rules="[{ required: true, message: 'Please input coefficient!' }]"
+              :label-col="{ span: 6 }"
+              :wrapper-col="{ span: 14 }"
+            >
+              <a-input type="number" v-model="formVal.coefficient"></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+
         <a-form-model-item v-if="formVal.sample" label="Qc Flags" style="margin-bottom: 0">
           <a-row :gutter="10">
             <a-col
@@ -298,6 +319,26 @@
           >
           </dic-select>
         </a-form-model-item>
+
+        <a-form-model-item
+          label="Identify nuclides"
+          prop="identifyNuclides"
+          :rules="[{ required: true, message: 'Please select Identify nuclides!' }]"
+        >
+          <a-select
+            class="form-select"
+            mode="multiple"
+            placeholder="select..."
+            :maxTagCount="5"
+            :filter-option="filterOption"
+            show-arrow
+            :options="nuclideOptions"
+            v-model="formVal.identifyNuclides"
+          >
+            <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
+          </a-select>
+        </a-form-model-item>
+
         <a-form-model-item
           label="Contact Group"
           prop="contactGroup"
@@ -348,7 +389,9 @@ const InitialFormVal = {
   // 新增的Sample Type、Sample和Coefficient
   sampleType: null,
   sample: null,
+  days: null,
   coefficient: 1.0,
+  identifyNuclides: undefined,
 }
 
 export default {
@@ -647,8 +690,8 @@ export default {
         if (this.isAdd) {
           const { success } = await postAction('/alarmAnalysisRule/add', params)
           if (success) {
-            this.visible = false
             this.$refs.form.resetFields()
+            this.visible = false
             this.$message.success('success')
             this.getAlarmRulesPage()
           } else {
@@ -657,8 +700,8 @@ export default {
         } else {
           const { success } = await httpAction('/alarmAnalysisRule/edit', { ...params, id: this.currId }, 'put')
           if (success) {
-            this.visible = false
             this.$refs.form.resetFields()
+            this.visible = false
             this.$message.success('success')
             this.getAlarmRulesPage()
           } else {
@@ -904,4 +947,18 @@ export default {
     flex-shrink: 0;
   }
 }
+
+.flex {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.avg-cycle {
+  ::v-deep {
+    .ant-input {
+      padding-right: 42px;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
index 393398a..238ef7f 100644
--- a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue
@@ -18,6 +18,7 @@
             style="width: 180px"
             v-model="queryParams.stationId"
             placeholder="select..."
+            show-search
             :filter-option="filterOption"
             show-arrow
             allowClear