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,