From 56eb07ec2b77db1917440c63d283ce38357d9f09 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: Wed, 17 Apr 2024 17:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BB=98=E5=88=B6=E7=9F=A9=E5=BD=A2=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?updateSampleData=20=E4=B9=8B=E5=90=8E=E5=86=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 5036934..13e2305 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -562,7 +562,6 @@ export default {
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
           this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
-          this.handleReAnalyse(res.result)
           updateSampleData({
             inputFileName: this.sample.inputFileName,
             key: 'XeData',
@@ -573,6 +572,7 @@ export default {
             key: 'savedAnalysisResult',
             data: res.result.savedAnalysisResult,
           })
+          this.handleReAnalyse(res.result)
           if (res.result.bProcessed) {
             this.$message.success(res.result.message)
           } else {
@@ -628,19 +628,6 @@ export default {
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-
-          if (inputFileName == this.sample.inputFileName) {
-            this.$emit('sendXeData', XeData)
-            this.$emit('reAnalyAll', savedAnalysisResult, XeData)
-            this.handleReAnalyse(sampleInfo)
-
-            if (bProcessed) {
-              this.$message.success(message)
-            } else {
-              this.$message.warning(message)
-            }
-          }
-
           updateSampleData({
             inputFileName,
             key: 'XeData',
@@ -652,6 +639,17 @@ export default {
             key: 'savedAnalysisResult',
             data: savedAnalysisResult,
           })
+          if (inputFileName == this.sample.inputFileName) {
+            this.$emit('sendXeData', XeData)
+            this.$emit('reAnalyAll', savedAnalysisResult, XeData)
+            this.handleReAnalyse(sampleInfo)
+
+            if (bProcessed) {
+              this.$message.success(message)
+            } else {
+              this.$message.warning(message)
+            }
+          }
         })
       } else {
         this.$message.warning(message)