src/views/spectrumAnalysis/beta-gamma-analysis.vue

@@ -303,7 +303,7 @@ export default {
           item.nidFlag = val ? 1 : 0
         }
       })
-      this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, this.sampleDetail.savedAnalysisResult)
+      this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode)
     },
     async getSampleDetail() {
       this.spectraType = this.SampleType[0].value
@@ -562,6 +562,7 @@ 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',
@@ -572,7 +573,6 @@ export default {
             key: 'savedAnalysisResult',
             data: res.result.savedAnalysisResult,
           })
-          this.handleReAnalyse(res.result)
           if (res.result.bProcessed) {
             this.$message.success(res.result.message)
           } else {
@@ -628,17 +628,7 @@ export default {
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-          updateSampleData({
-            inputFileName,
-            key: 'XeData',
-            data: XeData,
-          })
 
-          updateSampleData({
-            inputFileName,
-            key: 'savedAnalysisResult',
-            data: savedAnalysisResult,
-          })
           if (inputFileName == this.sample.inputFileName) {
             this.$emit('sendXeData', XeData)
             this.$emit('reAnalyAll', savedAnalysisResult, XeData)
@@ -650,6 +640,18 @@ export default {
               this.$message.warning(message)
             }
           }
+
+          updateSampleData({
+            inputFileName,
+            key: 'XeData',
+            data: XeData,
+          })
+
+          updateSampleData({
+            inputFileName,
+            key: 'savedAnalysisResult',
+            data: savedAnalysisResult,
+          })
         })
       } else {
         this.$message.warning(message)