src/views/abnormalAlarm/analysisMonitor/alarmRules/config/index.js

@@ -1,68 +0,0 @@
-export const SampleTypeOptions = [
-  {
-    label: 'All',
-    value: 'All'
-  },
-  {
-    label: 'Gamma',
-    value: 'Gamma'
-  },
-  {
-    label: 'Beta',
-    value: 'Beta'
-  }
-]
-
-export const SampleMap = {
-  All: ['P', 'B', 'G', 'C'],
-  Gamma: ['P', 'G'],
-  Beta: ['B', 'C']
-}
-
-export const MenuNameMap = {
-  P: 'Particulate',
-  G: 'Noble Gas HPGe',
-  B: 'Noble Gas Beta-Gamma',
-  C: 'Self-Station'
-}
-
-export const QcFlagOptions = {
-  P: [
-    { label: 'acq_time (h)', isArray: false, value: 18, prop: 'acqTime' },
-    { label: 'airFlow (m3/h)', isArray: false, value: 500, prop: 'airFlow' },
-    { label: 'decay_time (h)', isArray: false, value: 26.4, prop: 'decayTime' },
-    { label: 'samp_vol (m3)', isArray: false, value: 10800, prop: 'sampVol' },
-    { label: 'Be7-FWHM (keV)', isArray: false, value: 1.7, prop: 'be7FWHM' },
-    {
-      label: 'Ba140-MDC (uBq/m3)',
-      isArray: false,
-      value: 30,
-      prop: 'ba140MDC'
-    },
-    { label: 'col_time (h)', isArray: true, value: [21.6, 26.4], prop: 'colTime' }
-  ],
-  B: [
-    { label: 'Xenon Volume (ml)', isArray: false, value: 0.2, prop: 'xeVol' },
-    { label: 'Collection Time (h)', isArray: true, value: [6.0, 24.0], prop: 'colTime' },
-    { label: 'Acqusition Time (h)', isArray: true, value: [6.0, 24.0], prop: 'acqTime' },
-    { label: 'MDC for Xe133 (mBq/m3)', isArray: true, value: [0.001, 5], prop: 'xe133MDC' },
-    { label: 'Xe131m Flag', isArray: false, value: 1, disabled: true, prop: 'xe131mFlag' },
-    { label: 'Xe133m Flag', isArray: false, value: 1, disabled: true, prop: 'xe133mFlag' },
-    { label: 'Xe133 Flag', isArray: false, value: 1, disabled: true, prop: 'xe133Flag' },
-    { label: 'Xe135 Flag', isArray: false, value: 1, disabled: true, prop: 'xe135Flag' }
-  ],
-  G: [
-    { label: 'airFlow (m3/h)', isArray: false, value: 0.4, prop: 'airFlow' },
-    { label: 'decay_time (h)', isArray: false, value: 10.0, prop: 'decayTime' },
-    { label: 'samp_vol (m3)', isArray: false, value: 10, prop: 'sampVol' },
-    { label: 'Xe133-MDC (uBq/m3)', isArray: false, value: 1000, prop: 'xe133MDC' },
-    { label: 'acq_time (h)', isArray: true, value: [16.0, 24.0], prop: 'acqTime' },
-    { label: 'col_time (h)', isArray: true, value: [21.6, 24.0], prop: 'colTime' },
-  ],
-  C: [
-    { label: 'Xe131m Flag', isArray: false, value: 1, disabled: true, prop: 'xe131mFlag' },
-    { label: 'Xe133m Flag', isArray: false, value: 1, disabled: true, prop: 'xe133mFlag' },
-    { label: 'Xe133 Flag', isArray: false, value: 1, disabled: true, prop: 'xe133Flag' },
-    { label: 'Xe135 Flag', isArray: false, value: 1, disabled: true, prop: 'xe135Flag' }
-  ]
-}

src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue

@@ -154,8 +154,6 @@
         @showSizeChange="handleSizeChange"
       />
     </div>
-
-    <!-- 新增/编辑规则弹窗 -->
     <a-modal
       :title="isAdd ? 'Add Rule' : 'Edit Rule'"
       :width="800"
@@ -163,74 +161,52 @@
       :maskClosable="false"
       @cancel="onCancel"
     >
-      <a-form-model
+      <a-form :form="form" :label-col="labelCol" :wrapper-col="wrapperCol">
-        ref="form"
+        <a-form-item label="Name">
-        :model="formVal"
+          <a-input
-        :label-col="labelCol"
+            v-decorator="[
-        :wrapper-col="wrapperCol"
+              'name',
-        style="max-height: calc(100vh - 341px); overflow: hidden auto"
+              {
-      >
+                rules: [{ required: true, message: 'Please input name!' }],
-        <a-form-model-item label="Name" prop="name" :rules="[{ required: true, message: 'Please input name!' }]">
+                initialVale: this.formVal.name,
-          <a-input v-model="formVal.name" />
+              },
-        </a-form-model-item>
+            ]"
+          />
+        </a-form-item>
 
-        <a-form-model-item label="Source" prop="source" :rules="[{ required: true, message: 'Please select source!' }]">
+        <a-form-item label="Source">
-          <dic-select type="checkbox" dictCode="alarm_analyse_rule_source" v-model="formVal.source" />
+          <dic-select
-        </a-form-model-item>
+            type="checkbox"
-        <a-row>
+            dictCode="alarm_analyse_rule_source"
-          <a-col :span="12">
+            v-decorator="[
-            <a-form-model-item
+              'source',
-              label="Sample Type"
+              {
-              prop="sampleType"
+                rules: [{ required: true }],
-              :rules="[{ required: true, message: 'Please select sample type!' }]"
+                initialVale: this.formVal.source,
-              :label-col="{ span: 8 }"
+              },
-              :wrapper-col="{ span: 16 }"
+            ]"
-            >
+          />
-              <a-select v-model="formVal.sampleType" @change="handleSampleTypeChange" style="width: 100%">
+        </a-form-item>
-                <a-select-option v-for="item in SampleTypeOptions" :key="item.value" :value="item.value">
+        <a-form-item label="Station">
-                  {{ item.label }}
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item
-              label="Sample"
-              prop="sample"
-              :rules="[{ required: true, message: 'Please select sample!' }]"
-              :label-col="{ span: 8 }"
-              :wrapper-col="{ span: 12 }"
-            >
-              <a-select v-model="formVal.sample" @change="handleSampleChange" style="width: 100%">
-                <a-select-option v-for="item in sampleList" :key="item" :value="item">
-                  {{ item }}
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-form-model-item
-          label="Station"
-          prop="station"
-          :rules="[{ required: true, message: 'Please select station!' }]"
-        >
           <a-select
             class="form-select"
             mode="multiple"
             placeholder="select..."
             :filter-option="filterOption"
             show-arrow
-            :options="filteredStationList"
+            :options="stationOptions"
-            v-model="formVal.station"
+            v-decorator="[
+              'station',
+              {
+                rules: [{ required: true, message: 'Please select station' }],
+                initialVale: this.formVal.station,
+              },
+            ]"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
           </a-select>
-        </a-form-model-item>
+        </a-form-item>
-        <a-form-model-item
+        <a-form-item label="Nuclide">
-          label="Nuclide"
-          prop="nuclide"
-          :rules="[{ required: true, message: 'Please select nuclide!' }]"
-        >
           <a-select
             class="form-select"
             mode="multiple"
@@ -239,126 +215,75 @@
             :filter-option="filterOption"
             show-arrow
             :options="nuclideOptions"
-            v-model="formVal.nuclide"
+            v-decorator="[
+              'nuclide',
+              {
+                rules: [{ required: true, message: 'Please select nuclide' }],
+                initialVale: this.formVal.nuclide,
+              },
+            ]"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
           </a-select>
-        </a-form-model-item>
+        </a-form-item>
-
+        <a-form-item label="Qualifier">
-        <a-row :gutter="10">
+          <dic-select
-          <a-col :span="12">
+            type="checkbox"
-            <a-form-model-item
+            dictCode="spectral_qualifier"
-              label="Avg cycle"
+            v-decorator="[
-              prop="days"
+              'qualifier',
-              :rules="[{ required: true, message: 'Please input Avg cycle!' }]"
+              {
-              :label-col="{ span: 8 }"
+                rules: [{ required: true }],
-              :wrapper-col="{ span: 16 }"
+                initialVale: this.formVal.qualifier,
-            >
+              },
-              <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
-              class="qc-item"
-              :span="item.disabled ? 6 : item.isArray ? 24 : 12"
-              v-for="(item, index) in qcFlagList"
-              :key="index"
-            >
-              <a-checkbox v-model="item.checked"></a-checkbox>
-              <span>{{ item.label }}</span>
-              <!-- 如果有两个值 -->
-              <template v-if="item.isArray">
-                <a-input type="number" v-model="item.value[0]" placeholder="min" :readOnly="!item.checked"></a-input>
-                <a-input type="number" v-model="item.value[1]" placeholder="max" :readOnly="!item.checked"></a-input>
-              </template>
-              <template v-else>
-                <a-input
-                  v-if="!item.disabled"
-                  type="number"
-                  v-model="item.value"
-                  :readOnly="item.disabled || !item.checked"
-                  placeholder="请输入..."
           />
-              </template>
+        </a-form-item>
-            </a-col>
+        <a-form-item label="Condition">
-          </a-row>
-        </a-form-model-item>
-        <a-form-model-item
-          label="Qualifier"
-          prop="qualifier"
-          :rules="[{ required: true, message: 'Please select qualifier!' }]"
-        >
-          <dic-select type="checkbox" dictCode="spectral_qualifier" v-model="formVal.qualifier" />
-        </a-form-model-item>
-        <a-form-model-item
-          label="Condition"
-          prop="condition"
-          :rules="[{ required: true, message: 'Please select condition!' }]"
-        >
           <dic-select
             type="checkbox"
             layout="vertical"
             dictCode="alarm_analyse_rule_condition"
-            v-model="formVal.condition"
+            v-decorator="[
+              'condition',
+              {
+                rules: [{ required: true }],
+                initialVale: this.formVal.condition,
+              },
+            ]"
           >
           </dic-select>
-        </a-form-model-item>
+        </a-form-item>
-
+        <a-form-item label="Contact Group">
-        <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"
-          :rules="[{ required: true, message: 'Please select contact group!' }]"
-        >
           <a-select
             class="form-select"
             :options="contactGroupOptions"
             show-arrow
             allowClear
             placeholder="select..."
-            v-model="formVal.contactGroup"
+            v-decorator="[
+              'contactGroup',
+              {
+                rules: [{ required: true }],
+                initialVale: this.formVal.contactGroup,
+              },
+            ]"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
           </a-select>
-        </a-form-model-item>
+        </a-form-item>
-        <a-form-model-item label="Remark">
+        <a-form-item label="Remark">
-          <a-input type="textarea" v-model="formVal.remark" />
+          <a-input
-        </a-form-model-item>
+            type="textarea"
-      </a-form-model>
+            v-decorator="[
+              'remark',
+              {
+                initialVale: this.formVal.remark,
+              },
+            ]"
+          />
+        </a-form-item>
+      </a-form>
       <template slot="footer">
         <a-space class="operators" :size="20">
           <a-button type="success" @click="onSave">Save</a-button>
@@ -366,34 +291,12 @@
         </a-space>
       </template>
     </a-modal>
-    <!-- 新增/编辑规则弹窗 -->
   </div>
 </template>
 
 <script>
 import { getAction, postAction, httpAction, deleteAction, putAction } from '@/api/manage'
 import DicSelect from '../../components/dicSelect.vue'
-import { MenuNameMap, QcFlagOptions, SampleMap, SampleTypeOptions } from './config'
-import { cloneDeep } from 'lodash'
-
-const InitialFormVal = {
-  name: '',
-  source: null,
-  station: undefined,
-  nuclide: undefined,
-  qualifier: null,
-  condition: null,
-  contactGroup: null,
-  remark: '',
-
-  // 新增的Sample Type、Sample和Coefficient
-  sampleType: null,
-  sample: null,
-  days: null,
-  coefficient: 1.0,
-  identifyNuclides: undefined,
-}
-
 export default {
   components: {
     DicSelect,
@@ -436,14 +339,18 @@ export default {
       wrapperCol: { span: 18 },
       form: this.$form.createForm(this),
       contactGroupOptions: [],
-      formVal: cloneDeep(InitialFormVal),
+      formVal: {
+        name: '',
+        source: null,
+        station: undefined,
+        nuclide: undefined,
+        qualifier: null,
+        condition: null,
+        contactGroup: undefined,
+        remark: '',
+      },
       monitorList: [],
       currId: '',
-
-      SampleTypeOptions,
-      sampleList: [],
-      qcFlagList: [],
-      filteredStationList: [],
     }
   },
   created() {
@@ -453,35 +360,29 @@ export default {
     this.getAlarmRulesPage()
   },
   methods: {
-    async getStationList() {
+    getStationList() {
-      this.stationOptions = await this.stationRequest('')
+      getAction('/webStatistics/findStationList', { menuName: '' }).then((res) => {
-    },
+        if (res.success) {
-
+          if (res.result.length > 0) {
-    async stationRequest(menuName) {
+            this.stationOptions = res.result.map((item) => {
-      try {
-        const { success, result } = await getAction('/webStatistics/findStationList', { menuName })
-        if (success) {
-          return result.map((item) => {
               return {
                 label: item.stationCode,
                 value: `${item.stationId}`,
               }
             })
+          } else {
+            this.stationOptions = []
+          }
         } else {
           this.$message.warning('This operation fails. Contact your system administrator')
-          return []
-        }
-      } catch (error) {
-        this.$message.error(error)
-        return []
         }
+      })
     },
-
     getNuclideList() {
       getAction('/sys/defaultNuclide/allName', { useType: 2 }).then((res) => {
         if (res.success) {
           if (res.result.length > 0) {
-            this.nuclideOptions = Array.from(new Set(res.result)).map((item) => {
+            this.nuclideOptions = res.result.map((item) => {
               return {
                 label: item,
                 value: item,
@@ -498,32 +399,10 @@ export default {
     handleAdd() {
       this.isAdd = true
       this.visible = true
-      this.formVal = cloneDeep(InitialFormVal)
-
-      this.sampleList = []
-      this.qcFlagList = []
-      this.filteredStationList = []
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-
-    // Sample Type改变
-    handleSampleTypeChange() {
-      this.sampleList = SampleMap[this.formVal.sampleType]
-      this.formVal.sample = undefined
-      this.formVal.station = undefined
-      this.filteredStationList = []
-    },
-
-    // sample改变
-    async handleSampleChange() {
-      this.qcFlagList = QcFlagOptions[this.formVal.sample]
-      this.filteredStationList = []
-      this.formVal.station = undefined
-      this.filteredStationList = await this.stationRequest(MenuNameMap[this.formVal.sample])
-    },
-
     onStationChange(val) {
       this.queryParams.station = val
     },
@@ -556,61 +435,28 @@ export default {
       this.ipagination.current = 1
       this.getAlarmRulesPage()
     },
-    async editItem(id) {
+    editItem(id) {
-      try {
       this.currId = id
-        const { success, result, message } = await getAction('/alarmAnalysisRule/finInfo', { id })
+      getAction('/alarmAnalysisRule/finInfo', { id }).then((res) => {
-        if (success) {
+        if (res.success) {
           this.isAdd = false
           this.visible = true
-          const {
+          this.$nextTick(() => {
-            sourceChecked,
+            this.form.setFieldsValue({
-            qualifierChecked,
+              name: res.result.name,
-            conditionChecked,
+              source: res.result.sourceChecked.join(','),
-            stationChecked,
+              station: res.result.stationChecked,
-            nuclidesChecked,
+              nuclide: res.result.nuclidesChecked,
-            identifyNuclidesChecked,
+              qualifier: res.result.qualifierChecked.join(','),
-
+              condition: res.result.conditionChecked.join(','),
-            acqTime,
+              contactGroup: res.result.contactGroup,
-            colTime,
+              remark: res.result.remark,
-            xe133MDC,
+            })
-          } = result
-
-          this.formVal = {
-            ...result,
-
-            acqTime: acqTime ? (acqTime.length > 1 ? acqTime : acqTime[0]) : null,
-            colTime: colTime ? (colTime.length > 1 ? colTime : colTime[0]) : null,
-            xe133MDC: xe133MDC ? (xe133MDC.length > 1 ? xe133MDC : xe133MDC[0]) : null,
-
-            identifyNuclides: identifyNuclidesChecked,
-            station: stationChecked,
-            nuclide: nuclidesChecked,
-
-            source: sourceChecked.join(','),
-            qualifier: qualifierChecked.join(','),
-            condition: conditionChecked.join(','),
-          }
-
-          this.sampleList = SampleMap[this.formVal.sampleType]
-          this.qcFlagList = this.qcFlagList = QcFlagOptions[this.formVal.sample].map((item) => {
-            const val = this.formVal[item.prop]
-            const hasVal = val !== null && val !== undefined
-            return {
-              ...item,
-              checked: hasVal,
-              value: hasVal ? val : item.value,
-            }
           })
-
-          this.filteredStationList = await this.stationRequest(MenuNameMap[this.formVal.sample])
         } else {
           this.$message.warning('This operation fails. Contact your system administrator')
-          console.log(message)
-        }
-      } catch (error) {
-        console.log(error)
         }
+      })
     },
     deleteItem(id) {
       let _this = this
@@ -669,71 +515,47 @@ export default {
         }
       })
     },
-    async onSave() {
+    onSave() {
-      try {
+      this.form.validateFields((err, values) => {
-        await this.$refs.form.validate()
+        if (!err) {
-
+          let params = {
-        const qcFlagsHasBlank = this.qcFlagList.some(({ isArray, value, checked }) => {
+            conditions: values.condition,
-          return checked && (!value || (isArray && value.some((v) => !v)))
+            name: values.name,
-        })
+            remark: values.remark,
-        if (qcFlagsHasBlank) {
+            stations: values.station.join(','),
-          this.$message.warning('Please fill in the QC Flag value')
+            source: values.source,
-          return
+            nuclides: values.nuclide.join(','),
-        }
+            contactGroup: values.contactGroup,
-
+            spectralQualifier: values.qualifier,
-        const qcFlags = this.qcFlagList.reduce((acc, { prop, value, isArray, checked }) => {
-          const val = checked ? (isArray ? value.join(',') : value) : null
-          acc[prop] = val
-          return acc
-        }, {})
-
-        // 清理已有的qc flags的值
-        Object.values(QcFlagOptions).forEach((v) => {
-          v.forEach((item) => {
-            this.formVal[item.prop] = null
-          })
-        })
-
-        const { station, nuclide, qualifier, condition, identifyNuclides } = this.formVal
-        const params = {
-          ...this.formVal,
-          nuclide: undefined,
-          station: undefined,
-          condition: undefined,
-          spectralQualifier: qualifier,
-          conditions: condition,
-          stations: station.join(','),
-          nuclides: nuclide.join(','),
-          identifyNuclides: identifyNuclides.join(','),
-          ...qcFlags,
           }
           if (this.isAdd) {
-          const { success } = await postAction('/alarmAnalysisRule/add', params)
+            postAction('/alarmAnalysisRule/add', params).then((res) => {
-          if (success) {
+              if (res.success) {
-            this.$refs.form.resetFields()
                 this.visible = false
+                this.form.resetFields()
                 this.$message.success('success')
                 this.getAlarmRulesPage()
               } else {
                 this.$message.warning('This operation fails. Contact your system administrator')
               }
+            })
           } else {
-          const { success } = await httpAction('/alarmAnalysisRule/edit', { ...params, id: this.currId }, 'put')
+            httpAction('/alarmAnalysisRule/edit', { ...params, id: this.currId }, 'put').then((res) => {
-          if (success) {
+              if (res.success) {
-            this.$refs.form.resetFields()
                 this.visible = false
+                this.form.resetFields()
                 this.$message.success('success')
                 this.getAlarmRulesPage()
               } else {
                 this.$message.warning('This operation fails. Contact your system administrator')
               }
+            })
           }
-      } catch (error) {
-        console.log(error)
         }
+      })
     },
     onCancel() {
-      this.$refs.form.resetFields()
+      this.form.resetFields()
       this.visible = false
     },
   },
@@ -957,28 +779,4 @@ export default {
     }
   }
 }
-
-.qc-item {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-
-  span {
-    flex-shrink: 0;
-  }
-}
-
-.flex {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.avg-cycle {
-  ::v-deep {
-    .ant-input {
-      padding-right: 42px;
-    }
-  }
-}
 </style>

src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue

@@ -18,7 +18,6 @@
             style="width: 180px"
             v-model="queryParams.stationId"
             placeholder="select..."
-            show-search
             :filter-option="filterOption"
             show-arrow
             allowClear

src/views/spectrumAnalysis/beta-analysis.vue

@@ -73,6 +73,7 @@
               ref="RoiChartRef"
               :ROILists="ROILists"
               :ROIAnalyzeLists="ROIAnalyzeLists"
+              :gammaEnergyData="gammaEnergyData"
             />
           </beta-gamma-chart-container>
           <!-- 底部显示 -->
@@ -280,30 +281,14 @@ export default {
             data: analyseList,
           })
 
-          // 更新XeData
           updateSampleData({
             inputFileName,
             key: 'XeData',
             data: result.XeData,
           })
+
+          // 更新XeData
           this.resultDisplay = result.XeData
-
-          const { betaEnergyData, gammaEnergyData } = result
-          // 更新 betaEnergyData 和 gammaEnergyData
-          this.betaEnergyData = betaEnergyData
-          this.gammaEnergyData = gammaEnergyData
-
-          // 更新sample的 betaEnergyData 和 gammaEnergyData
-          updateSampleData({
-            inputFileName,
-            key: 'sample.betaEnergyData',
-            data: betaEnergyData,
-          })
-          updateSampleData({
-            inputFileName,
-            key: 'sample.gammaEnergyData',
-            data: gammaEnergyData,
-          })
         } else {
           const arr = message.split('\n')
           this.$warning({
@@ -577,7 +562,7 @@ export default {
 
     // 从分析工具刷新部分数据
     handleRefresh(data, index) {
-      this.$set(this.ROIAnalyzeLists, index, data)
+      this.ROIAnalyzeLists[index] = this.$set(this.ROIAnalyzeLists, index, data)
 
       const { inputFileName } = this.sample
       updateSampleData({
@@ -600,7 +585,7 @@ export default {
         BaseCtrls,
       } = data
 
-      this.$set(this.ROIAnalyzeLists, index, {
+      this.ROIAnalyzeLists[index] = this.$set(this.ROIAnalyzeLists, index, {
         allData,
         peak,
         shadowChannelChart,

src/views/spectrumAnalysis/beta-gamma-analysis.vue

@@ -337,7 +337,6 @@ export default {
           })
         } else {
           this.$message.error(message)
-          this.isLoading = false
         }
       } catch (error) {
         console.error(error)

src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue

@@ -228,7 +228,7 @@ import { updateBaseLine } from '@/utils/WasmHelper'
 import RectList from './components/RectList.vue'
 import { isNullOrUndefined } from '@/utils/util'
 import { findNearPeak, getLineData, transformPointListData } from '@/utils/sampleHelper'
-import { getSampleData, updateSampleData } from '@/utils/SampleStore'
+import { getSampleData } from '@/utils/SampleStore'
 
 // 初始配置
 const initialOption = {
@@ -1536,7 +1536,6 @@ export default {
             nuclideName: possibleNuclide,
             fileName,
             list_identify: nuclides,
-            energyTolerance: this.model.tolerance
           })
           if (success) {
             nuclides.push(possibleNuclide)
@@ -1574,13 +1573,6 @@ export default {
             const { identify, table } = result
             this.selectedTableItem.nuclides = identify
             this.list = table
-            // 更新自身缓存 
-            /** fix：解决删除核素再次打开弹窗还能显示被删除的核素问题 20241128:xiao */
-            updateSampleData({
-              inputFileName: fileName,
-              key: 'peak',
-              data: table,
-            })
           } else {
             this.$message.error(message)
           }

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue

@@ -668,11 +668,9 @@ export default {
             oldScatterSeries,
             newCToE,
             newEToC,
-            tableWidgets,
           } = res.result
           this.c2e = CToE
           this.e2c = EToC
-          this.list = tableWidgets
 
           this.oldScatterSeries = oldScatterSeries
           this.count = oldScatterSeries.length
@@ -697,11 +695,6 @@ export default {
 
           this.oldChartOption = cloneDeep(this.figureChartOption)
 
-          this.figureChartOption.series[1].markPoint.data = tableWidgets.map((item) => ({
-            xAxis: item.channel,
-            yAxis: item.energy,
-          }))
-
           // 如果点击过reanalyze则渲染之前fitting的数据，如果没点Reanalyze，数据会在窗口关闭时删掉 20231101：xiao
           // todo 现在能谱数据没有缓存，刷新页面时也会获取到fitting的数据
           if (this.getCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName)) {

src/views/spectrumAnalysis/components/Modals/SelfStation/BetaAnalyzeInteractiveToolModal/index.vue

@@ -1603,7 +1603,6 @@ export default {
             fileName,
             list_identify: nuclides,
             gammaRoiNum: this.currROIIndex + 1,
-            energyTolerance: this.model.tolerance
           })
           if (success) {
             nuclides.push(possibleNuclide)

src/views/spectrumAnalysis/components/Modals/SelfStation/BetaModal.vue

@@ -122,7 +122,6 @@ export default {
     open(seriesData, energys) {
       this.option.series.data = (seriesData || []).map(({ x, y }) => [x, y])
       this.energys = energys || []
-      this.axisInfo = cloneDeep(initialAxisInfo)
       this.visible = true
     },
 

src/views/spectrumAnalysis/components/Modals/SelfStation/GammaModal.vue

@@ -122,7 +122,6 @@ export default {
     open(seriesData, energys) {
       this.option.series.data = (seriesData || []).map(({ x, y }) => [x, y])
       this.energys = energys || []
-      this.axisInfo = cloneDeep(initialAxisInfo)
       this.visible = true
     },
 

src/views/spectrumAnalysis/components/RoiLimits/RoiLimits.vue

@@ -5,6 +5,7 @@
       :key="index"
       :title="`ROI${index + 1}`"
       :title-color="RoiTitleColors[index]"
+      :energys="gammaEnergyData"
       :roi-list="ROILists[index]"
       :analyze-result="ROIAnalyzeLists[index]"
       @toggle="handleToggle"
@@ -33,6 +34,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    gammaEnergyData: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     this.RoiTitleColors = RoiTitleColors

src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue

@@ -132,6 +132,10 @@ export default {
   props: {
     title: String,
     titleColor: String,
+    energys: {
+      type: Array,
+      default: () => [],
+    },
     roiList: {
       type: Array,
       default: () => [],
@@ -187,24 +191,14 @@ export default {
     this.$bus.$off('SelfStationBetaSpectrumChange', this.handleLimitItemChange)
   },
   methods: {
-    /**
-     * 根据channel获取energy
-     * @param {number} channel
-     */
-    getEnergyByChannel(channel) {
-      const energyItem = this.allEnergy ? this.allEnergy[channel - 1] : null
-      return energyItem ? energyItem.x : 0
-    },
-
     handleTooltipFormat(params) {
       const [xAxis, count] = params[0].value
       const channel = Math.round(xAxis)
       const channelData = this.channelData.all && this.channelData.all.pointlist[channel]
-      const energy = this.getEnergyByChannel(channel)
       this.axisInfo = {
         channel,
         count: channelData ? channelData.y : count,
-        energy: energy.toFixed(2),
+        energy: (this.energys[channel] || 0).toFixed(3),
       }
     },
 
@@ -329,9 +323,6 @@ export default {
         baseLineCP: shapeChannelData,
       }
 
-      const allEnergy = this.getLineData(allData, 'Energy', 'energy')
-      this.allEnergy = allEnergy.pointlist
-
       // 设置 Spectrum Line
       this.setSeriesData(
         this.option.series,

src/views/spectrumAnalysis/index.vue

@@ -1109,22 +1109,6 @@ export default {
 
     // 查看软件操作帮助文档
     handleHelp() {
-      let docPath = null
-      let apiBaseUrl = window._CONFIG['onlinePreviewDomainURL'] || "/jeecg-boot";
-      if(this.isGamma) {
-        docPath =  `/armd-help/Gamma.pdf`;
-      } else if (this.isBeta) {
-        docPath =  `/armd-help/Self-Beta-Gamma.pdf`;
-      } else if(this.isBetaGamma) {
-        docPath =  `/armd-help/Beta-Gamma.pdf`;
-      }
-      
-      if(!docPath) {
-        this.$message.warning('Please load an spectrum first!')
-        return ;
-      }
-      window.open(apiBaseUrl + docPath, '_blank');
-
       console.log('%c [ handleHelp ]-221', 'font-size:13px; background:pink; color:#bf2c9f;')
     },
 

src/views/spectrumAnalysis/seriesBuilder.js

@@ -32,7 +32,6 @@ export const scacLineSeries = buildLineSeries('ScacLine', [], '#fff', {
 export const baseLineCtrlPoint = {
   name: 'BaseLine_Ctrl_Point',
   type: 'scatter',
-  symbolSize: 10,
   data: [],
   emphasis: {
     disabled: true

src/views/stationOperation/components/markerPopupColumns.js

@@ -228,80 +228,6 @@ export default {
       key: 'phdMetSoh'
     }
   ],
-  [MarkerType.GroudMonitoringStation]: [
-    {
-      label: 'STATIONCODE',
-      key: 'stationCode'
-    },
-    {
-      label: 'STATIONID',
-      key: 'stationId'
-    },
-    {
-      label: 'COUNTRYCODE',
-      key: 'countryCode'
-    },
-    {
-      label: 'DATEBEGIN',
-      key: 'dateBegin'
-    },
-    {
-      label: 'DATEEND',
-      key: 'dateEnd'
-    },
-    {
-      label: 'DESCRIPTION',
-      key: 'description'
-    },
-    {
-      label: 'ELEVATION',
-      key: 'elevation'
-    },
-    {
-      label: 'LATITUDE',
-      key: 'lat'
-    },
-    {
-      label: 'LONGITUDE',
-      key: 'lon'
-    },
-    {
-      label: 'MODDATE',
-      key: 'moddate'
-    },
-    {
-      label: 'STATUS',
-      key: 'status'
-    },
-    {
-      label: 'TYPE',
-      key: 'type'
-    },
-    {
-      label: 'USED',
-      key: 'used'
-    },
-    {
-      label: 'PHD',
-      key: 'phd'
-    },
-    {
-      label: 'PHDF',
-      key: 'phdf'
-    },
-    {
-      label: 'MET',
-      key: 'met'
-    },
-    {
-      label: 'SOH',
-      key: 'soh'
-    },
-    {
-      label: 'PHDF+MET+SOH',
-      key: 'phdMetSoh'
-    }
-  ],
   [MarkerType.NRL]: [
     {
       label: 'STATIONCODE',

src/views/system/Scheduling.vue

@@ -115,19 +115,7 @@
     <!-- 增加/编辑排班弹窗 -->
     <custom-modal :title="isAdd ? 'Add' : 'Edit'" :width="845" v-model="visible" :okHandler="submit" destroy-on-close>
       <a-spin :spinning="isGettingDetail">
-        <div style=" margin: 0 auto;display: flex; width: 672px;">
-        </div>
         <div class="account-assign">
-          <div class="scheduling-date">
-            <label>Task Date</label>
-            <a-range-picker
-              dropdownClassName="asd"
-              :default-value="[moment(startTime), moment(endTime)]"
-              @change="onRangeDateChange"
-              :allowClear="false"
-              :style="{width:'200px'}"
-            />
-          </div>
           <div class="search">
             <!-- 穿梭框左上方搜索 -->
             <div class="station-search">
@@ -265,9 +253,6 @@ export default {
       rightAccountChildSelectedKeys: [], // 右侧穿梭框选中的值
       rightAccountChildExpandedKeys: [], // 右侧穿梭框中展开的父元素
 
-      startTime: moment().format('YYYY-MM-DD'),
-      endTime: moment().format('YYYY-MM-DD'),
-      
       isChanging: false,
       dragItem: null,
       fromUserId: '',
@@ -314,7 +299,6 @@ export default {
     this.getStationList()
   },
   methods: {
-    moment,
     // 获取该月日程列表
     async getList() {
       this.spinningMain = true
@@ -554,17 +538,11 @@ export default {
           successMsg = 'Add Success'
           failMsg = 'Add Fail'
         }
-        if(!this.startTime || !this.endTime) {
+        const params = []
-          this.$message.warn('Please select a date!')
-          return;
-        }
-        
-        const tasks = []
         this.accountTreeData.forEach((accountTreeItem) => {
           if (accountTreeItem.children.length) {
-            tasks.push({
+            params.push({
-              // fix:改为控件选择日期 20241112
+              schedulingDate: this.currentDate.format('YYYY-MM-DD HH:mm:ss'),
-              // schedulingDate: this.currentDate.format('YYYY-MM-DD HH:mm:ss'),
               stationList: accountTreeItem.children.map((child) => {
                 return {
                   stationId: child.key,
@@ -574,11 +552,6 @@ export default {
             })
           }
         })
-        const params = {
-          startTime: this.startTime,
-          endTime: this.endTime,
-          sysTasks: tasks
-        }
         const { success } = await method(url, params)
         if (success) {
           this.$message.success(successMsg)
@@ -695,11 +668,6 @@ export default {
       }
       this.targetKeys = targetKeys
     },
-    onRangeDateChange(date, dateString) {
-      // this.timer = 0
-      this.startTime = dateString[0]
-      this.endTime = dateString[1]
-    },
   },
   computed: {
     treeData() {
@@ -967,14 +935,10 @@ export default {
   width: 672px;
   margin: 0 auto;
 
-  .scheduling-date{
+  .search {
-    margin-bottom: 15px;
+    display: flex;
-    label {
+    justify-content: space-between;
-      width: 81px;
-    }
-  }
 
-  .scheduling-date,
     .station-search,
     .account-search {
       width: 282px;
@@ -988,10 +952,6 @@ export default {
         user-select: none;
       }
     }
-  .search {
-    display: flex;
-    justify-content: space-between;
-
   }
 
   .ant-transfer {