From 878212006aceae2c0d4316f2931b9e86db625bca 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, 15 Mar 2024 16:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86beta=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=A4=B1=E8=B4=A5=EF=BC=8CsavedAnalysisResul?=
 =?UTF-8?q?t=20=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index cfc11fc..3033f66 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -289,7 +289,7 @@ export default {
         }
       }
 
-      this.changeChartByType(this.spectraType)
+      this.changeChartByType(this.spectraType, result.XeData)
     },
 
     handleGetFlag(val, obj) {
@@ -401,7 +401,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 +452,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)
@@ -555,7 +555,7 @@ export default {
             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)
           if (res.result.bProcessed) {
             this.$message.success(res.result.message)
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
index fb127b2..aa583b2 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
@@ -153,7 +153,7 @@ 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.isReanlyze = true
           this.handleExit()
           this.$bus.$emit('ReAnalyses', res.result)
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index db81862..b46b882 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -475,7 +475,7 @@ 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) {