From e9c693ee5110ad8199006bf1c9b7859f89b2c07a Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 11 Apr 2024 09:58:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?WIP:=20=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                            |  2 -
 src/store/modules/sample.js                   | 52 ------------
 src/utils/SampleStore.js                      | 84 +++++++++++++++++++
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 27 ++++--
 .../spectrumAnalysis/clearSampleCache.js      |  4 +-
 .../AnalyzeInteractiveToolModal/index.vue     |  9 +-
 .../BetaGammaEnergyCalibrationModal/index.vue |  4 +-
 src/views/spectrumAnalysis/gamma-analysis.vue |  7 +-
 src/views/spectrumAnalysis/index.vue          | 10 ++-
 9 files changed, 125 insertions(+), 74 deletions(-)
 delete mode 100644 src/store/modules/sample.js
 create mode 100644 src/utils/SampleStore.js

diff --git a/src/store/index.js b/src/store/index.js
index b77f9bd..5936c50 100644
--- a/src/store/index.js
+++ b/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: {
 
diff --git a/src/store/modules/sample.js b/src/store/modules/sample.js
deleted file mode 100644
index 71219e2..0000000
--- a/src/store/modules/sample.js
+++ /dev/null
@@ -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
diff --git a/src/utils/SampleStore.js b/src/utils/SampleStore.js
new file mode 100644
index 0000000..a16e82c
--- /dev/null
+++ b/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
+}
diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 3033f66..183e306 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/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'
@@ -323,10 +324,11 @@ export default {
           this.changeChartByType('sample')
           this.emitGetFiles(result)
 
-          this.$store.commit('ADD_SAMPLE_DATA', {
+          addSampleData({
             inputFileName,
             data: result,
             from: 'db',
+            type: 'beta',
           })
         } else {
           this.$message.error(message)
@@ -369,11 +371,13 @@ export default {
           this.sampleDetail = result
           this.changeChartByType('sample')
 
-          this.$store.commit('ADD_SAMPLE_DATA', {
+          addSampleData({
             inputFileName: this.sample.sampleFileName,
             data: result,
             from: 'file',
+            type: 'beta',
           })
+
           this.isLoading = false
         } else {
           this.$message.error(message)
@@ -568,6 +572,7 @@ export default {
         }
       })
     },
+    // 分析全部
     getAnalyzeAllSpectrum() {
       let params = {
         dbNames: [this.sample.dbName],
@@ -588,13 +593,24 @@ export default {
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-          this.$emit('reAnalyAll', true, res.result.XeData)
+          this.$emit('reAnalyAll', res.result.savedAnalysisResult, res.result.XeData)
+          // 因为重新分析后的数据保存在服务端，故清理需要重新加载的本地缓存
+
+          this.removeOtherBetaSamples()
         } else {
           this.$message.warning(res.message)
         }
       })
     },
 
+    // 移除其他的beta缓存
+    removeOtherBetaSamples() {
+      const filterList = sampleList.filter(
+        (item) => item.type !== 'beta' || item.inputFileName == this.sample.inputFileName
+      )
+      setSampleList(filterList)
+    },
+
     // 右下角放大镜
     handleZoom(nuclideName) {
       let ROI_nums = []
@@ -655,7 +671,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
@@ -673,6 +689,7 @@ export default {
             this.getSampleDetail_file()
           }
         }
+        await this.$nextTick()
         this.$refs.betaGammaChartRef.handleUnzoom()
       },
       immediate: true,
@@ -683,7 +700,7 @@ export default {
         // this.currResultDisplay = newVal.XeData
         this.resultDisplay = cloneDeep(newVal.XeData) || []
         this.sortResultDisplay()
-        this.$store.commit('UPDATE_SAMPLE_DATA', {
+        updateSampleData({
           inputFileName: this.sample.inputFileName,
           key: 'XeData',
           data: newVal.XeData,
diff --git a/src/views/spectrumAnalysis/clearSampleCache.js b/src/views/spectrumAnalysis/clearSampleCache.js
index 76f0e6b..b7dc52c 100644
--- a/src/views/spectrumAnalysis/clearSampleCache.js
+++ b/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}`)
   })
diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index 7f919a3..d65cea1 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/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() {
-      await this.getInfo()
+    beforeModalOpen() {
+      this.getInfo()
       this.reset()
     },
 
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index aa583b2..4d31536 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/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],
@@ -179,8 +180,7 @@ export default {
     // 清理相同台站的缓存
     clearSameStationCache(sampleList) {
       sampleList.forEach(({ inputFileName }) => {
-        console.log('inputFileName>>' + inputFileName)
-        this.$store.commit('REMOVE_SAMPLE_DATA', inputFileName)
+        removeSampleData(inputFileName)
       })
     },
     // 相同台站能谱缓存一样的Calibration数据 20231115：xiao
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index c482f6d..5207dd9 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/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: {
@@ -579,7 +580,7 @@ export default {
     dataProcess(result, flag) {
       const { inputFileName } = this.sample
 
-      this.$store.commit('ADD_SAMPLE_DATA', {
+      addSampleData({
         inputFileName,
         data: result,
         from: flag,
@@ -2057,11 +2058,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
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index b46b882..41e2c4b 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -281,6 +281,7 @@ import BGLogViewer from './components/Modals/BetaGammaModals/BGLogViewer.vue'
 
 import { saveAs } from 'file-saver'
 import CompareFromDbModal from './components/Modals/CompareFromDBModal.vue'
+import { clearSampleData, updateSampleDataAnaly } from '@/utils/SampleStore'
 
 // 分析类型
 const ANALYZE_TYPE = {
@@ -467,7 +468,7 @@ export default {
 
   destroyed() {
     this.$bus.$off('reanalyse', this.handleReanalyse)
-    this.$store.commit('CLEAR_SAMPLE_DATA')
+    clearSampleData()
     this.handleCleanAll()
     window.removeEventListener('beforeunload', this.handleCleanAll)
   },
@@ -478,8 +479,10 @@ export default {
       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
@@ -841,7 +844,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 +903,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,
             })

From 990ab9def568a9581dd2fa3cdf2a37ddf5ad1fca Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 11 Apr 2024 16:00:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/beta-gamma-analysis.vue | 13 ++++++++-----
 .../components/BetaGammaSpectrumChart.vue          | 14 ++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 183e306..be1d339 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -328,7 +328,6 @@ export default {
             inputFileName,
             data: result,
             from: 'db',
-            type: 'beta',
           })
         } else {
           this.$message.error(message)
@@ -375,7 +374,6 @@ export default {
             inputFileName: this.sample.sampleFileName,
             data: result,
             from: 'file',
-            type: 'beta',
           })
 
           this.isLoading = false
@@ -605,9 +603,14 @@ export default {
 
     // 移除其他的beta缓存
     removeOtherBetaSamples() {
-      const filterList = sampleList.filter(
-        (item) => item.type !== 'beta' || item.inputFileName == this.sample.inputFileName
-      )
+      const regExp = /([A-Z]+\d+_\d+)(-[\w\s_\.]+)/
+      const stationAndDetectorName = this.sample.inputFileName.replace(regExp, '$1')
+      // 清理掉不是自己，且台站号+探测器号跟自己一样的谱，让它重新加载
+      const filterList = sampleList.filter((item) => {
+        const inputFileName = item.inputFileName
+        return inputFileName == this.sample.inputFileName || !inputFileName.startsWith(stationAndDetectorName)
+      })
+
       setSampleList(filterList)
     },
 
diff --git a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue
index 413b135..d24d6c2 100644
--- a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue
+++ b/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,

From 333a7fd1f429228ef119ec78d7bcfe06e1fd3ec3 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 12 Apr 2024 17:00:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9beta=E4=B8=8B=E7=9A=84=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=B0=B1=E6=97=B6=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E8=B0=B1=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=B3=E4=BD=BF=E5=B7=B2=E7=BB=8F=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=BF=87=E4=BA=86=EF=BC=8C=E8=BF=98=E6=98=AF=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomChart/index.vue          |   3 +-
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 113 ++++++++++++------
 .../components/BetaDetectorCalibration.vue    |   2 +-
 src/views/spectrumAnalysis/gamma-analysis.vue |  39 ++++--
 src/views/spectrumAnalysis/index.vue          |   9 +-
 5 files changed, 115 insertions(+), 51 deletions(-)

diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue
index 44a3a22..99cd6fc 100644
--- a/src/components/CustomChart/index.vue
+++ b/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: {
diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index be1d339..95dab69 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -190,6 +190,10 @@ export default {
     analyseCurrentSpectrum: {
       type: Object,
     },
+    sampleList: {
+      type: Array,
+      required: true,
+    },
   },
   data() {
     this.SampleType = SampleType
@@ -238,7 +242,7 @@ export default {
       this.qcFlagsVisible = true
     }, 100)
   },
-  destroyed() {
+  beforeDestroy() {
     this.cancelLastRequest()
     this.$bus.$off('ReAnalyses', this.handleReAnalyse)
 
@@ -559,6 +563,16 @@ export default {
           })
           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 {
@@ -571,47 +585,77 @@ export default {
       })
     },
     // 分析全部
-    getAnalyzeAllSpectrum() {
-      let params = {
-        dbNames: [this.sample.dbName],
-        sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
-        sampleFileNames: [this.sample.inputFileName],
-        gasFileNames: [this.sample.gasFileName],
-        detFileNames: [this.sample.detFileName],
-        qcFileNames: [this.sample.qcFileName],
+    async getAnalyzeAllSpectrum() {
+      const regExp = /^([A-Z]{1,}\d{1,})_/
+      const regMatched = this.sample.inputFileName.match(regExp)
+      const currStationName = regMatched[1]
+      const dbNames = [],
+        sampleIds = [],
+        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) => {
-        if (res.success) {
-          // this.analyseCurrentSpectrum = res.result
-          this.$emit('sendXeData', res.result.XeData)
-          res.result.XeData.forEach((item) => {
+      const { success, result, message } = await postAction('/spectrumAnalysis/analyseAllSpectrum', params)
+      if (success) {
+        // 对所有已加载的谱中和本谱相似的谱（指台站和探测器相同）
+        Object.entries(result).forEach(([inputFileName, sampleInfo]) => {
+          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', res.result.savedAnalysisResult, res.result.XeData)
-          // 因为重新分析后的数据保存在服务端，故清理需要重新加载的本地缓存
 
-          this.removeOtherBetaSamples()
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
+          if (inputFileName == this.sample.inputFileName) {
+            this.$emit('sendXeData', XeData)
+            this.$emit('reAnalyAll', savedAnalysisResult, XeData)
+            this.handleReAnalyse(sampleInfo)
 
-    // 移除其他的beta缓存
-    removeOtherBetaSamples() {
-      const regExp = /([A-Z]+\d+_\d+)(-[\w\s_\.]+)/
-      const stationAndDetectorName = this.sample.inputFileName.replace(regExp, '$1')
-      // 清理掉不是自己，且台站号+探测器号跟自己一样的谱，让它重新加载
-      const filterList = sampleList.filter((item) => {
-        const inputFileName = item.inputFileName
-        return inputFileName == this.sample.inputFileName || !inputFileName.startsWith(stationAndDetectorName)
-      })
+            if (bProcessed) {
+              this.$message.success(message)
+            } else {
+              this.$message.warning(message)
+            }
+          }
 
-      setSampleList(filterList)
+          updateSampleData({
+            inputFileName,
+            key: 'XeData',
+            data: XeData,
+          })
+
+          updateSampleData({
+            inputFileName,
+            key: 'savedAnalysisResult',
+            data: savedAnalysisResult,
+          })
+        })
+      } else {
+        this.$message.warning(message)
+      }
     },
 
     // 右下角放大镜
@@ -703,11 +747,6 @@ export default {
         // this.currResultDisplay = newVal.XeData
         this.resultDisplay = cloneDeep(newVal.XeData) || []
         this.sortResultDisplay()
-        updateSampleData({
-          inputFileName: this.sample.inputFileName,
-          key: 'XeData',
-          data: newVal.XeData,
-        })
       },
       // immediate: true,
       deep: true,
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
index d547111..73283c2 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
+++ b/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)
   },
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 5207dd9..c32cde4 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -191,8 +191,8 @@ export default {
       stripSumOrCutLine: null,
       stripReferenceLine: null,
     }
-    ;(this.peakList = []), // Peak 列表（非点位）
-      (this.baseCtrls = {}) // BaseCtrls
+    this.peakList = [] // Peak 列表（非点位）
+    this.baseCtrls = {} // BaseCtrls
 
     return {
       abc: false,
@@ -254,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)
@@ -264,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 => {
@@ -465,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.onerror = this.websocketOnerror
-      this.websock.onmessage = this.websocketOnmessage
-      this.websock.onclose = this.websocketOnclose
+      this.websock.addEventListener('open', this.websocketOnopen)
+      this.websock.addEventListener('error', this.websocketOnerror)
+      this.websock.addEventListener('message', this.websocketOnmessage)
+      this.websock.addEventListener('close', this.websocketOnclose)
     },
     websocketOnopen: function () {
       // console.log('WebSocket连接成功1231')
@@ -494,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
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 41e2c4b..1fe5be1 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/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,7 +282,7 @@ import BGLogViewer from './components/Modals/BetaGammaModals/BGLogViewer.vue'
 
 import { saveAs } from 'file-saver'
 import CompareFromDbModal from './components/Modals/CompareFromDBModal.vue'
-import { clearSampleData, updateSampleDataAnaly } from '@/utils/SampleStore'
+import { clearSampleData, getSampleData, updateSampleDataAnaly } from '@/utils/SampleStore'
 
 // 分析类型
 const ANALYZE_TYPE = {
@@ -466,7 +467,7 @@ export default {
     window.addEventListener('beforeunload', this.handleCleanAll)
   },
 
-  destroyed() {
+  beforeDestroy() {
     this.$bus.$off('reanalyse', this.handleReanalyse)
     clearSampleData()
     this.handleCleanAll()
@@ -504,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) {
@@ -608,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 = ''
     },