From 0984cfcd5c52b53ae1ea29a14acaf0dc24faacac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Fri, 10 Nov 2023 11:59:25 +0800
Subject: [PATCH] =?UTF-8?q?beta=20=E6=A8=A1=E5=9D=97=E4=B8=AD=20Energy=20C?=
 =?UTF-8?q?alibration=20=E5=BC=B9=E7=AA=97=E4=B8=AD=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=86=E6=9E=90=EF=BC=8C=E6=89=93=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=80view=20RRR=20=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/beta-gamma-analysis.vue           | 5 ++---
 .../BetaGammaEnergyCalibrationModal/index.vue                | 2 +-
 src/views/spectrumAnalysis/index.vue                         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 7153206..5085e76 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -225,11 +225,11 @@ export default {
     }
   },
   created() {
-    this.$bus.$on('ReAnalyse', this.redrawRect)
+    this.$bus.$on('ReAnalyses', this.redrawRect)
   },
   destroyed() {
     this.cancelLastRequest()
-    this.$bus.$off('ReAnalyse', this.redrawRect)
+    this.$bus.$off('ReAnalyses', this.redrawRect)
   },
   methods: {
     // 重新绘制矩形框
@@ -372,7 +372,6 @@ export default {
           XeData, // 右下角Result Display
           savedAnalysisResult,
         } = this.sampleDetail
-
         this.spectrumData = spectrumData
 
         this.histogramDataList = histogramDataList
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index 5aae86e..d9f3371 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
@@ -151,7 +151,7 @@ export default {
           this.$message.success('Analyse Success!')
           this.isReanlyze = true
           this.handleExit()
-          this.$bus.$emit('ReAnalyse', res.result)
+          this.$bus.$emit('ReAnalyses', res.result)
         } else {
           this.$message.warning(res.message)
         }
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 69b0f57..63c77f2 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -461,7 +461,7 @@ export default {
       }
       this.resultDisplayFlag = arg
       this.params_toDB.stationName = val
-      this.isReAnalyed_beta = flag
+      this.isReAnalyed_beta = this.isReAnalyed_beta ? this.isReAnalyed_beta : flag
     },
     getCheckFlag(val) {
       this.params_toDB.checkSample = val.checkSample