From e7f4656fef9a0e34395479fdcb5459f01cceb10a Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 15 Nov 2023 15:09:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20beta=20=E4=B8=8B=E7=9A=84energy=20calibr?=
 =?UTF-8?q?ation=EF=BC=8C=E9=80=89=E4=BA=86AllSpectrum=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=86=E6=9E=90=EF=BC=8C=E6=8A=8A=E5=A4=87?=
 =?UTF-8?q?=E9=80=89=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9B=B8=E5=90=8C=E5=8F=B0?=
 =?UTF-8?q?=E7=AB=99=E7=9A=84=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=BD=93XeData=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaEnergyCalibrationModal/index.vue     | 15 +++++++++++++++
 src/views/spectrumAnalysis/index.vue              |  6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index d9f3371..4a24e3f 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
@@ -152,11 +152,26 @@ export default {
           this.isReanlyze = true
           this.handleExit()
           this.$bus.$emit('ReAnalyses', res.result)
+
+          if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
+            this.clearSameStationCache(
+              matchedSampleList.filter((item) => item.inputFileName !== this.newSampleData.inputFileName)
+            )
+          }
         } else {
           this.$message.warning(res.message)
         }
       })
     },
+
+    // 清理相同台站的缓存
+    clearSameStationCache(sampleList) {
+      sampleList.forEach(({ inputFileName }) => {
+        this.$store.commit('REMOVE_SAMPLE_DATA', inputFileName)
+        this.$ls.remove('calibration-gamma:' + inputFileName)
+      })
+    },
+
     handleExit() {
       this.gammaEnergyValid = this.isReanlyze
       console.log('exit>>>this.isReanlyze>>>' + this.isReanlyze)
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 8c26b7b..ce8a864 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -471,8 +471,10 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
-      this.resultDisplayFlag = val
+      if(val && val.length) {
+        this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
+        this.resultDisplayFlag = val
+      }
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData
     getFiles(val) {