fix: 修复部分内存溢出问题，修改beta下的分析全部谱时的逻辑，修复切换谱后，即使已经分析过了，还是无法保存的问题

分析失败 将右下角Result display的数据清空

src/components/CustomChart/index.vue

@@ -30,9 +30,10 @@ export default {
     this._chart.setOption(this.option, this.opts)
     this.initEventListener()
   },
-  destroyed() {
+  beforeDestroy() {
     if (this._chart) {
       this._chart.dispose()
+      this._chart = null
     }
   },
   methods: {

src/components/CustomTable/index.vue

@@ -2,6 +2,7 @@
   <a-table
     ref="tableRef"
     class="custom-table"
+    :class="['custom-table', canSelect && multiple && mouseMoveSelect ? 'mouse-move-select' : '']"
     v-bind="$attrs"
     :data-source="list"
     :columns="columns"
@@ -9,7 +10,7 @@
     :row-key="rowKey"
     :loading="loading"
     :pagination="pagination"
-    :customRow="customRow"
+    :customRow="multiple && mouseMoveSelect ? customMouseMoveSelectRow : customRow"
     :rowClassName="() => (canSelect ? 'custom-table-row' : '')"
     @change="handleTableChange"
   >
@@ -58,10 +59,16 @@ export default {
       type: Boolean,
       default: true,
     },
+    // 多选
     multiple: {
       type: Boolean,
       default: false,
     },
+    // 鼠标移动选择
+    mouseMoveSelect: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -69,6 +76,14 @@ export default {
       innerSelectedRows: [],
     }
   },
+  mounted() {
+    if (this.canSelect && this.multiple && this.mouseMoveSelect) {
+      const tbody = this.$el.querySelector('.ant-table-tbody')
+      tbody.addEventListener('mouseleave', () => {
+        this.mouseMoveStartIndex = undefined
+      })
+    }
+  },
   methods: {
     // 实现单击选中/反选功能
     customRow(record, index) {
@@ -105,6 +120,34 @@ export default {
         },
       }
     },
+
+    // 实现鼠标拖移动多选功能
+    customMouseMoveSelectRow(record, index) {
+      const key = record[this.rowKey]
+      return {
+        class: this.innerSelectedRowKeys.includes(key) ? 'ant-table-row-selected' : '',
+        on: {
+          mousedown: () => {
+            this.innerSelectedRowKeys = []
+            this.mouseMoveStartIndex = index
+          },
+          mouseenter: () => {
+            if (this.mouseMoveStartIndex !== undefined) {
+              const indexes = [this.mouseMoveStartIndex, index].sort((a, b) => a - b)
+              this.innerSelectedRowKeys = this.list.slice(indexes[0], indexes[1] + 1).map((item) => item[this.rowKey])
+            }
+          },
+          mouseup: () => {
+            // 开始和结束在同一个，相当于click
+            if (this.mouseMoveStartIndex == index) {
+              this.innerSelectedRowKeys = [key]
+            }
+            this.mouseMoveStartIndex = undefined
+          },
+        },
+      }
+    },
+
     handleTableChange(pagination, filters, sorter) {
       this.$emit('change', pagination, filters, sorter)
     },
@@ -136,8 +179,20 @@ export default {
   },
 }
 </script>
-<style lang="less">
+<style lang="less" scoped>
-.custom-table-row {
+::v-deep {
+  .custom-table-row {
     cursor: pointer;
+  }
+}
+
+.mouse-move-select {
+  user-select: none;
+
+  ::v-deep {
+    td {
+      transition: none !important;
+    }
+  }
 }
 </style>

src/store/index.js

@@ -6,7 +6,6 @@ import user from './modules/user'
 import permission from './modules/permission'
 import enhance from './modules/enhance'
 import online from './modules/online'
-import sample from './modules/sample'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -18,7 +17,6 @@ export default new Vuex.Store({
     permission,
     enhance,
     online,
-    sample
   },
   state: {
 

src/store/modules/sample.js

@@ -1,52 +0,0 @@
-const sample = {
-  state: Object.freeze({
-    sampleList: [] // [{ inputFileName: String; data: Object; }]
-  }),
-  mutations: {
-    SET_SAMPLE_LIST: (state, sampleList) => {
-      state.sampleList = sampleList
-    },
-
-    ADD_SAMPLE_DATA: (state, sampleData) => {
-      const find = state.sampleList.find(item => item.inputFileName == sampleData.inputFileName)
-      if (find) {
-        find.data = sampleData.data
-      } else {
-        state.sampleList.push(sampleData)
-      }
-    },
-
-    UPDATE_SAMPLE_DATA: (state, { inputFileName, key, data }) => {
-      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
-      if (find) {
-        find.data[key] = data
-      }
-    },
-    UPDATE_SAMPLE_DATA_ANALY: (state, { inputFileName, data }) => {
-      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
-      if (find) {
-        data.DetailedInformation = find.data.DetailedInformation
-        find.data = data
-      }
-    },
-
-    REMOVE_SAMPLE_DATA: (state, inputFileName) => {
-      const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName)
-      if(-1 !== findIndex) {
-        state.sampleList.splice(findIndex, 1)
-      }
-    },
-
-    CLEAR_SAMPLE_DATA: (state) => {
-      state.sampleList = []
-    }
-  },
-  actions: {
-    GET_SAMPLE_DATA: ({ state }, inputFileName) => {
-      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
-      return find ? find : null
-    }
-  }
-}
-
-export default sample

src/utils/SampleStore.js

@@ -0,0 +1,84 @@
+// 所有缓存的谱
+let sampleList = []
+
+/**
+ * 重新设置缓存的谱
+ * @param {Array} list
+ */
+const setSampleList = list => {
+  sampleList = list
+}
+
+/**
+ * 缓存一条谱数据
+ * @param {*} sampleData
+ */
+const addSampleData = sampleData => {
+  const find = sampleList.find(item => item.inputFileName == sampleData.inputFileName)
+  if (find) {
+    find.data = sampleData.data
+  } else {
+    sampleList.push(sampleData)
+  }
+}
+
+/**
+ * 更新谱数据
+ * @param {{ inputFileName: string; key: string; data: any; }} param0
+ */
+const updateSampleData = ({ inputFileName, key, data }) => {
+  const find = sampleList.find(item => item.inputFileName == inputFileName)
+  if (find) {
+    find.data[key] = data
+  }
+}
+
+/**
+ * 移除谱数据
+ * @param {string} inputFileName
+ */
+const removeSampleData = inputFileName => {
+  const findIndex = sampleList.findIndex(item => item.inputFileName == inputFileName)
+  if (-1 !== findIndex) {
+    sampleList.splice(findIndex, 1)
+  }
+}
+
+/**
+ * 更新分析数据
+ * @param {{ inputFileName: string; data: any; }} param0
+ */
+const updateSampleDataAnaly = ({ inputFileName, data }) => {
+  const find = sampleList.find(item => item.inputFileName == inputFileName)
+  if (find) {
+    data.DetailedInformation = find.data.DetailedInformation
+    find.data = data
+  }
+}
+
+/**
+ * 清理缓存列表
+ */
+const clearSampleData = () => {
+  sampleList = []
+}
+
+/**
+ * 根据文件名获取谱
+ * @param {string} inputFileName
+ */
+const getSampleData = inputFileName => {
+  const find = sampleList.find(item => item.inputFileName == inputFileName)
+  return find ? find : null
+}
+
+export {
+  sampleList,
+  setSampleList,
+  addSampleData,
+  updateSampleData,
+  removeSampleData,
+  updateSampleDataAnaly,
+  clearSampleData,
+  getSampleData
+}

src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue

@@ -13,6 +13,7 @@
               :list="dataSource"
               :loading="loading"
               :canSelect="false"
+              :scroll="{ y: 390 }"
             >
               <template slot="info" slot-scope="{ record }">
                 <a-popover>

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

@@ -10,6 +10,7 @@
           :list="dataSource"
           :loading="loading"
           :pagination="false"
+          :scroll="{ y: 655 }"
           @rowDbclick="rowClick"
         >
           <!-- <template slot="stationList" slot-scope="{ text }">

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

@@ -53,6 +53,7 @@
         :loading="loading"
         :pagination="false"
         :canSelect="false"
+        :scroll="{ y: 655 }"
       >
       </TableList>
       <a-pagination

src/views/logManage/index.vue

@@ -30,6 +30,21 @@
     </a-card>
     <!-- 日志列表 -->
     <div class="log-list">
+      <div class="search-bar">
+        <a-row type="flex">
+          <a-col flex="290px">
+            <a-form-model-item label="Name">
+              <a-input v-model="nameStr" placeholder="Please Input..." />
+            </a-form-model-item>
+          </a-col>
+          <a-col flex="108px">
+            <a-button class="search-btn" type="primary" @click="onSearch">
+              <img src="@/assets/images/global/search.png" alt="" />
+              Search
+            </a-button>
+          </a-col>
+        </a-row>
+      </div>
       <custom-table
         size="middle"
         rowKey="id"
@@ -39,7 +54,7 @@
         :loading="isGettingTreeData || loading"
         :can-select="false"
         @change="handleTableChange"
-        :scroll="{ y: 'calc(100vh - 175px)' }"
+        :scroll="{ y: 'calc(100vh - 275px)' }"
       >
         <template slot="operate" slot-scope="{ record }">
           <a-space :size="20">
@@ -53,6 +68,22 @@
           </a-space>
         </template>
       </custom-table>
+      <a-pagination
+        size="small"
+        v-model="ipagination.current"
+        :pageSize="ipagination.pageSize"
+        :page-size-options="ipagination.pageSizeOptions"
+        show-size-changer
+        show-quick-jumper
+        :total="ipagination.total"
+        :show-total="
+          (total, range) =>
+            `Total ${total} items　Page ${ipagination.current} / ${Math.ceil(total / ipagination.pageSize)}`
+        "
+        show-less-items
+        @change="handlePageChange"
+        @showSizeChange="handleSizeChange"
+      />
     </div>
     <!-- 日志列表结束 -->
     <custom-modal title="Log" :width="950" v-model="visible" :footer="null">
@@ -108,6 +139,7 @@ export default {
   data() {
     this.columns = columns
     return {
+      nameStr: '',
       disableMixinCreated: true,
       url: {
         list: '/logManage/findFiles',
@@ -121,12 +153,37 @@ export default {
       visible: false,
       isGettingDetail: false,
       logInfo: [],
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          const { current, pageSize } = this.ipagination
+          return `Total ${total} items　Page ${current} / ${Math.ceil(total / pageSize)}`
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+      },
     }
   },
   created() {
     this.getTreeData()
   },
   methods: {
+    onSearch() {
+      this.loadData()
+    },
+    handlePageChange(page, pageSize) {
+      this.ipagination.current = page
+      this.ipagination.pageSize = pageSize
+      this.loadData()
+    },
+    handleSizeChange(current, size) {
+      this.ipagination.current = current
+      this.ipagination.pageSize = size
+      this.loadData()
+    },
     async getTreeData() {
       try {
         this.isGettingTreeData = true
@@ -164,6 +221,8 @@ export default {
     },
     onSelect() {
       this.queryParam.path = this.selectedKeys[0]
+      this.ipagination.current = 1
+      this.ipagination.pageSize = 10
       this.loadData()
     },
 
@@ -179,10 +238,14 @@ export default {
       this.onClearSelected()
 
       var params = this.getQueryParams() //查询条件
+      params.name = this.nameStr
+      params.pageNo = this.ipagination.current
+      params.pageSize = this.ipagination.pageSize
       this.loading = true
       getAction(this.url.list, params)
-        .then((res) => {
+        .then(({ result: { records, total } }) => {
-          this.dataSource = res
+          this.dataSource = records
+          this.ipagination.total = total
         })
         .finally(() => {
           this.loading = false
@@ -302,6 +365,10 @@ export default {
       }
     }
   }
+  &-list {
+    position: relative;
+    overflow: hidden;
+  }
 }
 
 .log-detail {
@@ -314,4 +381,59 @@ export default {
     }
   }
 }
+.search-bar {
+  height: 50px;
+  border-top: 1px solid rgba(13, 235, 201, 0.3);
+  border-bottom: 1px solid rgba(13, 235, 201, 0.3);
+  margin-bottom: 15px;
+  padding: 8px 10px;
+  background: rgba(12, 235, 201, 0.05);
+}
+.ant-input {
+  width: 266px;
+}
+::v-deep {
+  .ant-form-item {
+    display: flex;
+    margin-bottom: 0;
+    .ant-form-item-label,
+    .ant-form-item-control {
+      line-height: 32px;
+      height: 32px;
+    }
+    .ant-form-item-label {
+      flex-shrink: 0;
+      margin-right: 10px;
+      label {
+        font-size: 16px;
+        font-family: ArialMT;
+        color: #ade6ee;
+        &::after {
+          display: none;
+        }
+      }
+    }
+    .ant-calendar-range-picker-separator {
+      color: white;
+    }
+    .ant-form-item-control-wrapper {
+      width: 100%;
+      // overflow: hidden;
+    }
+  }
+}
+.search-btn {
+  margin-bottom: 10px;
+  img {
+    width: 16px;
+    height: 17px;
+    margin-right: 9px;
+  }
+}
+.ant-pagination {
+  position: absolute;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+}
 </style>

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

@@ -121,6 +121,7 @@
 </template>
 
 <script>
+import { addSampleData, getSampleData, sampleList, setSampleList, updateSampleData } from '@/utils/SampleStore'
 import { getAction, postAction } from '../../api/manage'
 import BetaGammaChartContainer from './components/BetaGammaChartContainer.vue'
 import BetaGammaSpectrumChart from './components/BetaGammaSpectrumChart.vue'
@@ -189,6 +190,10 @@ export default {
     analyseCurrentSpectrum: {
       type: Object,
     },
+    sampleList: {
+      type: Array,
+      required: true,
+    },
   },
   data() {
     this.SampleType = SampleType
@@ -237,7 +242,7 @@ export default {
       this.qcFlagsVisible = true
     }, 100)
   },
-  destroyed() {
+  beforeDestroy() {
     this.cancelLastRequest()
     this.$bus.$off('ReAnalyses', this.handleReAnalyse)
 
@@ -289,7 +294,7 @@ export default {
         }
       }
 
-      this.changeChartByType(this.spectraType)
+      this.changeChartByType(this.spectraType, result.XeData)
     },
 
     handleGetFlag(val, obj) {
@@ -323,7 +328,7 @@ export default {
           this.changeChartByType('sample')
           this.emitGetFiles(result)
 
-          this.$store.commit('ADD_SAMPLE_DATA', {
+          addSampleData({
             inputFileName,
             data: result,
             from: 'db',
@@ -369,11 +374,12 @@ export default {
           this.sampleDetail = result
           this.changeChartByType('sample')
 
-          this.$store.commit('ADD_SAMPLE_DATA', {
+          addSampleData({
             inputFileName: this.sample.sampleFileName,
             data: result,
             from: 'file',
           })
+
           this.isLoading = false
         } else {
           this.$message.error(message)
@@ -401,7 +407,7 @@ export default {
       return cancelToken
     },
 
-    changeChartByType(val) {
+    changeChartByType(val, data) {
       if (val === 'qc' && !this.sampleDetail.qc) {
         this.$message.warning('No qc spectrum file!')
       } else {
@@ -452,7 +458,7 @@ export default {
 
         console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay)
 
-        this.resultDisplay = XeData
+        this.resultDisplay = data ? data : XeData
         this.sortResultDisplay()
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
@@ -548,46 +554,108 @@ export default {
           // this.isReAnalyed_beta = true
           // this.analyseCurrentSpectrum = res.result
           this.$emit('sendXeData', res.result.XeData)
-          if (res.result.XeData && res.result.XeData.length > 0) {
+          // if (res.result.XeData && res.result.XeData.length > 0) {
           res.result.XeData.forEach((item) => {
             item.conc = parseFloat(item.conc.toPrecision(6))
             item.concErr = parseFloat(item.concErr.toPrecision(6))
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-            this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
           this.handleReAnalyse(res.result)
+          updateSampleData({
+            inputFileName: this.sample.inputFileName,
+            key: 'XeData',
+            data: res.result.XeData,
+          })
+          updateSampleData({
+            inputFileName: this.sample.inputFileName,
+            key: 'savedAnalysisResult',
+            data: res.result.savedAnalysisResult,
+          })
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
           }
+          // }
         } else {
           this.$message.warning(res.message)
         }
       })
     },
-    getAnalyzeAllSpectrum() {
+    // 分析全部
-      let params = {
+    async getAnalyzeAllSpectrum() {
-        dbNames: [this.sample.dbName],
+      const regExp = /^([A-Z]{1,}\d{1,})_/
-        sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
+      const regMatched = this.sample.inputFileName.match(regExp)
-        sampleFileNames: [this.sample.inputFileName],
+      const currStationName = regMatched[1]
-        gasFileNames: [this.sample.gasFileName],
+      const dbNames = [],
-        detFileNames: [this.sample.detFileName],
+        sampleIds = [],
-        qcFileNames: [this.sample.qcFileName],
+        sampleFileNames = [],
+        gasFileNames = [],
+        detFileNames = [],
+        qcFileNames = []
+
+      const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
+      matchedSampleList.forEach(
+        ({ dbName, sampleId, inputFileName, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
+          dbNames.push(dbName || '')
+          sampleIds.push(sampleId || '')
+          sampleFileNames.push(sampleFileName || inputFileName || '')
+          gasFileNames.push(gasFileName || '')
+          detFileNames.push(detFileName || '')
+          qcFileNames.push(qcFileStatus ? qcFileName : '')
+        }
+      )
+
+      const params = {
+        dbNames,
+        sampleIds,
+        sampleFileNames,
+        gasFileNames,
+        detFileNames,
+        qcFileNames,
         currentFileName: this.sample.inputFileName,
       }
-      postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
+      const { success, result, message } = await postAction('/spectrumAnalysis/analyseAllSpectrum', params)
-        if (res.success) {
+      if (success) {
-          // this.analyseCurrentSpectrum = res.result
+        // 对所有已加载的谱中和本谱相似的谱（指台站和探测器相同）
-          this.$emit('sendXeData', res.result.XeData)
+        Object.entries(result).forEach(([inputFileName, sampleInfo]) => {
-          res.result.XeData.forEach((item) => {
+          const { XeData, savedAnalysisResult, bProcessed, message } = sampleInfo
+          XeData.forEach((item) => {
             item.conc = parseFloat(item.conc.toPrecision(6))
             item.concErr = parseFloat(item.concErr.toPrecision(6))
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-          this.$emit('reAnalyAll', true, res.result.XeData)
+
+          if (inputFileName == this.sample.inputFileName) {
+            this.$emit('sendXeData', XeData)
+            this.$emit('reAnalyAll', savedAnalysisResult, XeData)
+            this.handleReAnalyse(sampleInfo)
+
+            if (bProcessed) {
+              this.$message.success(message)
             } else {
-          this.$message.warning(res.message)
+              this.$message.warning(message)
             }
+          }
+
+          updateSampleData({
+            inputFileName,
+            key: 'XeData',
+            data: XeData,
           })
+
+          updateSampleData({
+            inputFileName,
+            key: 'savedAnalysisResult',
+            data: savedAnalysisResult,
+          })
+        })
+      } else {
+        this.$message.warning(message)
+      }
     },
 
     // 右下角放大镜
@@ -650,7 +718,7 @@ export default {
     sample: {
       async handler(newVal, oldVal) {
         this.resultDisplay = []
-        const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
+        const sampleData = getSampleData(newVal.inputFileName)
         if (sampleData) {
           this.cancelLastRequest()
           this.isLoading = false
@@ -668,6 +736,7 @@ export default {
             this.getSampleDetail_file()
           }
         }
+        await this.$nextTick()
         this.$refs.betaGammaChartRef.handleUnzoom()
       },
       immediate: true,
@@ -678,11 +747,6 @@ export default {
         // this.currResultDisplay = newVal.XeData
         this.resultDisplay = cloneDeep(newVal.XeData) || []
         this.sortResultDisplay()
-        this.$store.commit('UPDATE_SAMPLE_DATA', {
-          inputFileName: this.sample.inputFileName,
-          key: 'XeData',
-          data: newVal.XeData,
-        })
       },
       // immediate: true,
       deep: true,

src/views/spectrumAnalysis/clearSampleCache.js

@@ -1,5 +1,5 @@
 import { deleteAction } from '@/api/manage'
-import store from '@/store'
+import { removeSampleData } from '@/utils/SampleStore'
 import Vue from 'vue'
 
 /**
@@ -16,7 +16,7 @@ export const clearSampleCache = sampleList => {
       params = { sampleFileName: fileName }
     }
     deleteAction(url, params)
-    store.commit('REMOVE_SAMPLE_DATA', fileName)
+    removeSampleData(fileName)
     Vue.ls.remove(`CALIBRATION_GAMMA_${fileName}`)
     Vue.ls.remove(`CALIBRATION_BETA_${fileName}`)
   })

src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue

@@ -327,7 +327,6 @@ export default {
       },
     }
   },
-
   mounted() {
     this.opts.notMerge = true
     this.$nextTick(() => {
@@ -565,13 +564,20 @@ export default {
     // 3D 图表
     histogramDataDList: {
       handler(newVal) {
-        const maxCount = Math.max(...newVal.map((item) => item.c))
+        let maxCount = 0
+        const data = []
+        for (const item of newVal) {
+          const { b, g, c } = item // 耗时较多
+          if (c > maxCount) maxCount = c
+          data.push([b, g, c])
+        }
+
         this.threeDSurfaceOption.zAxis3D.max = Math.ceil(maxCount * 1.2)
-        this.threeDSurfaceOption.series.data = newVal.map((item) => [item.b, item.g, item.c]) // 设置3D surface数据
+        this.threeDSurfaceOption.series.data = data // 设置3D surface数据 // 第一次设置耗时较多
         this.threeDSurfaceOption.visualMap.max = maxCount
 
         this.threeDScatterOption.zAxis3D.max = Math.ceil(maxCount * 1.2)
-        this.threeDScatterOption.series.data = newVal.map((item) => [item.b, item.g, item.c]) // 设置3D scatter数据
+        this.threeDScatterOption.series.data = data // 设置3D scatter数据
         this.threeDScatterOption.visualMap.max = maxCount
       },
       immediate: true,

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

@@ -228,6 +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 } from '@/utils/SampleStore'
 
 // 初始配置
 const initialOption = {
@@ -514,7 +515,7 @@ export default {
     }
   },
   methods: {
-    async getInfo() {
+    getInfo() {
       this.option.series = []
       this.thumbnailOption.series = []
       this.list = []
@@ -522,7 +523,7 @@ export default {
 
       const { inputFileName } = this.sampleData
 
-      const currSampleDetailInfo = await this.$store.dispatch('GET_SAMPLE_DATA', inputFileName)
+      const currSampleDetailInfo = getSampleData(inputFileName)
       const {
         data: { allData, shadowChannelChart, shapeChannelData, peak, BaseCtrls, barChart },
       } = currSampleDetailInfo
@@ -583,8 +584,8 @@ export default {
       this.handleResetChart()
     },
 
-    async beforeModalOpen() {
+    beforeModalOpen() {
-      await this.getInfo()
+      this.getInfo()
       this.reset()
     },
 
@@ -1562,14 +1563,16 @@ export default {
         try {
           this.$set(this.selectedTableItem, '_deleting', true)
           const { inputFileName: fileName } = this.sampleData
-          const { success, message } = await postAction('/gamma/deleteNuclide', {
+          const { success, result, message } = await postAction('/gamma/deleteNuclide', {
             curRow: this.curRow,
             nuclideName: this.model.identifiedNuclide,
             fileName,
             list_identify: nuclides,
           })
           if (success) {
-            nuclides.splice(findIndex, 1)
+            const { identify, table } = result
+            this.selectedTableItem.nuclides = identify
+            this.list = table
           } else {
             this.$message.error(message)
           }

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

@@ -629,7 +629,7 @@ export default {
     this.$bus.$on('betaRefresh', this.getData)
     this.getData()
   },
-  destroyed() {
+  beforeDestroy() {
     this.$bus.$off('betaRefresh', this.handleReset)
     this.$bus.$off('betaRefresh', this.getData)
   },

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

@@ -50,6 +50,7 @@ import { postAction } from '@/api/manage'
 import BetaDetectorCalibration from './components/BetaDetectorCalibration.vue'
 import GammaDetectorCalibration from './components/GammaDetectorCalibration.vue'
 import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder.vue'
+import { removeSampleData } from '@/utils/SampleStore'
 export default {
   components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder },
   mixins: [ModalMixin, SampleDataMixin],
@@ -153,11 +154,15 @@ export default {
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
           this.$emit('sendXeData', res.result.XeData)
-          this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
-          this.$message.success('Analyse Success!')
           this.isReanlyze = true
           this.handleExit()
           this.$bus.$emit('ReAnalyses', res.result)
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
+          }
 
           if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
             let sameStation = matchedSampleList.filter(
@@ -175,8 +180,7 @@ export default {
     // 清理相同台站的缓存
     clearSameStationCache(sampleList) {
       sampleList.forEach(({ inputFileName }) => {
-        console.log('inputFileName>>' + inputFileName)
+        removeSampleData(inputFileName)
-        this.$store.commit('REMOVE_SAMPLE_DATA', inputFileName)
       })
     },
     // 相同台站能谱缓存一样的Calibration数据 20231115：xiao

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -136,6 +136,7 @@ import { readFile, zipFile } from '@/utils/file'
 import { findNearPeak } from '@/utils/sampleHelper'
 import { add, subtract } from 'xe-utils/methods'
 import { PHDParser, isSample, getSampleTypeIdentify } from '@/utils/phdHelper'
+import { addSampleData, getSampleData } from '@/utils/SampleStore'
 
 export default {
   props: {
@@ -190,8 +191,8 @@ export default {
       stripSumOrCutLine: null,
       stripReferenceLine: null,
     }
-    ;(this.peakList = []), // Peak 列表（非点位）
+    this.peakList = [] // Peak 列表（非点位）
-      (this.baseCtrls = {}) // BaseCtrls
+    this.baseCtrls = {} // BaseCtrls
 
     return {
       abc: false,
@@ -253,7 +254,7 @@ export default {
     window.addEventListener('keydown', this.handleKeyboardEvent)
     window.addEventListener('click', this.closePeakInfomationTooltip)
   },
-  destroyed() {
+  beforeDestroy() {
     this.cancelLastRequest()
 
     this.$bus.$off('gammaRefresh', this.handleRefresh)
@@ -263,8 +264,16 @@ export default {
     window.removeEventListener('click', this.closePeakInfomationTooltip)
 
     if (this.qcFlagsTimer) {
-      clearTimeout(this.qcFlagsTimer)
+      window.clearTimeout(this.qcFlagsTimer)
     }
+
+    this.closeWebSocket()
+
+    if (this.websocketTimer) {
+      window.clearTimeout(this.websocketTimer)
+    }
+
+    this.websock = null
   },
   deactivated() {
     // Object.keys(this.subOperatorsState).forEach(k => {
@@ -464,10 +473,10 @@ export default {
       let token = Vue.ls.get(ACCESS_TOKEN)
       this.websock = new WebSocket(url, [token])
       //update-end-author:taoyan date:2022-4-22 for:  v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278
-      this.websock.onopen = this.websocketOnopen
+      this.websock.addEventListener('open', this.websocketOnopen)
-      this.websock.onerror = this.websocketOnerror
+      this.websock.addEventListener('error', this.websocketOnerror)
-      this.websock.onmessage = this.websocketOnmessage
+      this.websock.addEventListener('message', this.websocketOnmessage)
-      this.websock.onclose = this.websocketOnclose
+      this.websock.addEventListener('close', this.websocketOnclose)
     },
     websocketOnopen: function () {
       // console.log('WebSocket连接成功1231')
@@ -493,12 +502,25 @@ export default {
       if (that.lockReconnect) return
       that.lockReconnect = true
       //没连接上会一直重连，设置延迟避免请求过多
-      setTimeout(function () {
+      this.websocketTimer = setTimeout(function () {
         console.info('尝试重连...')
         that.initWebSocket()
         that.lockReconnect = false
       }, 20000)
     },
+
+    // 关闭websocket
+    closeWebSocket() {
+      if (this.websock) {
+        this.websock.removeEventListener('open', this.websocketOnopen)
+        this.websock.removeEventListener('error', this.websocketOnerror)
+        this.websock.removeEventListener('message', this.websocketOnmessage)
+        this.websock.removeEventListener('close', this.websocketOnclose)
+        this.websock.close()
+        this.websock = null
+      }
+    },
+
     // 获取样品详情
     async getSampleDetail() {
       const { dbName, sampleId, analyst } = this.sample
@@ -579,7 +601,7 @@ export default {
     dataProcess(result, flag) {
       const { inputFileName } = this.sample
 
-      this.$store.commit('ADD_SAMPLE_DATA', {
+      addSampleData({
         inputFileName,
         data: result,
         from: flag,
@@ -2057,11 +2079,11 @@ export default {
       immediate: true,
     },
     sample: {
-      async handler(newVal, oldVal) {
+      handler(newVal, oldVal) {
         console.log('newValnewVal', newVal)
         this.graphAssistance.axisType = 'Channel'
         this.handleResetState()
-        const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
+        const sampleData = getSampleData(newVal.inputFileName)
         if (sampleData) {
           this.cancelLastRequest()
           this.isLoading = false

src/views/spectrumAnalysis/index.vue

@@ -63,6 +63,7 @@
         :sampleInfo="sampleInfo"
         :sample="sampleData"
         :analyseCurrentSpectrum="analyseCurrentSpectrumData"
+        :sampleList="sampleList"
       />
       <!-- Beta-Gamma 分析 -->
       <div v-else class="empty">Please Select a Sample</div>
@@ -281,6 +282,7 @@ import BGLogViewer from './components/Modals/BetaGammaModals/BGLogViewer.vue'
 
 import { saveAs } from 'file-saver'
 import CompareFromDbModal from './components/Modals/CompareFromDBModal.vue'
+import { clearSampleData, getSampleData, updateSampleDataAnaly } from '@/utils/SampleStore'
 
 // 分析类型
 const ANALYZE_TYPE = {
@@ -465,9 +467,9 @@ export default {
     window.addEventListener('beforeunload', this.handleCleanAll)
   },
 
-  destroyed() {
+  beforeDestroy() {
     this.$bus.$off('reanalyse', this.handleReanalyse)
-    this.$store.commit('CLEAR_SAMPLE_DATA')
+    clearSampleData()
     this.handleCleanAll()
     window.removeEventListener('beforeunload', this.handleCleanAll)
   },
@@ -475,11 +477,13 @@ export default {
   methods: {
     getReAnalyCurr(flag, val) {
       this.isReAnalyed_beta = flag
-      this.params_toDB.savedAnalysisResult = true
+      this.params_toDB.savedAnalysisResult = flag
       this.resultDisplayFlag = val
     },
-    getReAnalyAll(val) {
+    getReAnalyAll(flag, val) {
+      this.isReAnalyed_beta = flag
       this.resultDisplayFlag = val
+      this.params_toDB.savedAnalysisResult = flag
     },
     handleReAnalyed(val) {
       this.isReAnalyed_gamma = val
@@ -501,6 +505,7 @@ export default {
       }
       this.resultDisplayFlag = arg
       this.params_toDB.stationName = val
+      this.params_toDB.savedAnalysisResult = flag
       this.isReAnalyed_beta = this.isReAnalyed_beta ? this.isReAnalyed_beta : flag
     },
     getCheckFlag(val) {
@@ -509,10 +514,10 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      if (val && val.length) {
+      // if (val && val.length) {
       this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
       this.resultDisplayFlag = val
-      }
+      // }
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData
     getFiles(val) {
@@ -605,12 +610,13 @@ export default {
       // B是beta-gamma  P G是gamma
       if (sample.sampleType == 'B') {
         this.analysisType = ANALYZE_TYPE.BETA_GAMMA
+        const sampleData = getSampleData(sample.inputFileName)
+        this.params_toDB.savedAnalysisResult = sampleData ? sampleData.data.savedAnalysisResult : false
       } else {
         this.analysisType = ANALYZE_TYPE.GAMMA
       }
       this.sampleData = this.newSampleData = sample
       this.currSampleDet = this.allSampleDet[sample.inputFileName]
-      this.params_toDB.savedAnalysisResult = sample.sampleId ? true : false
       this.params_toDB.comment = ''
     },
 
@@ -841,7 +847,6 @@ export default {
      * @param { 'all' | 'current' } type
      */
     handleSavePHDToFile(type) {
-      console.log('%c [ savePHDToFile ]-162', 'font-size:13px; background:pink; color:#bf2c9f;', type)
       if (this.isGamma) {
         if (type == 'current') {
           let params = {
@@ -901,7 +906,7 @@ export default {
         try {
           const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`)
           if (success) {
-            this.$store.commit('UPDATE_SAMPLE_DATA_ANALY', {
+            updateSampleDataAnaly({
               inputFileName: fileNames[0],
               data: result,
             })
@@ -1759,13 +1764,13 @@ export default {
 <style lang="less">
 .spectrum-analysis-operators-dropdown-overlay {
   background-color: #03353f;
+  z-index: 999;
+
   .ant-menu {
     background: transparent;
     padding: 0;
     position: relative;
     border-right: 0;
-    max-height: calc(100vh - 506px);
-    overflow: hidden auto;
 
     &-submenu {
       &-active {

src/views/system/Scheduling.vue

@@ -196,11 +196,11 @@
     </custom-modal>
     <!-- 增加/编辑排班弹窗结束 -->
     <custom-modal title="Failure record" v-model="visibleRes" :footer="null">
-      <custom-table size="middle" :columns="columns" :list="dataSource">
+      <a-table size="middle" :columns="columns" :dataSource="dataSource" :pagination="false" :scroll="{ y: 600 }">
         <template slot="index" slot-scope="{ index }">
           {{ index + 1 }}
         </template>
-      </custom-table>
+      </a-table>
     </custom-modal>
   </div>
 </template>