From f2a9cc93ed3ef7fcc8d4aef3be48648830ed1230 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, 8 Dec 2023 10:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=20=20beta=20=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=AE=8C=E6=88=90=E5=90=8E=20save=20To=20DB=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=B8=8D=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=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/views/spectrumAnalysis/beta-gamma-analysis.vue | 10 +++++++++-
 src/views/spectrumAnalysis/index.vue               |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 7ae363c..38393a4 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -224,6 +224,7 @@ export default {
       statisticModalVisible: false, // Qc Flags 点击后的弹窗
       statisticsType: StatisticsType['Collection Time'],
       currSample: {},
+      copyXeData: null,
     }
   },
   created() {
@@ -425,7 +426,13 @@ export default {
         this.betaProjectedData = betaProjectedData
         this.betaEnergyData = betaEnergyData
 
-        this.resultDisplay = this.resultDisplay.length > 0 ? this.resultDisplay : XeData
+        console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay)
+
+        this.resultDisplay = this.copyXeData
+          ? this.copyXeData
+          : this.resultDisplay.length > 0
+          ? this.resultDisplay
+          : XeData
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
 
@@ -528,6 +535,7 @@ export default {
               item.mdc = parseFloat(item.mdc.toPrecision(6))
             })
             this.$emit('reAnalyCurr', true, res.result.XeData)
+            this.copyXeData = res.result.XeData
 
             this.handleReAnalyse(res.result)
           }
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index b841bab..bf90e2d 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -392,7 +392,7 @@ export default {
       statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
       bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗
       analyseCurrentSpectrumData: {},
-      resultDisplayFlag: [],
+      resultDisplayFlag: null,
       params_toDB: {
         comment: '',
         savedAnalysisResult: false,