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)