diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index a43dc35..e87c043 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -352,7 +352,7 @@ export default { this.betaProjectedData = betaProjectedData this.betaEnergyData = betaEnergyData - this.resultDisplay = XeData + this.resultDisplay = this.resultDisplay.length > 0 ? this.resultDisplay : XeData this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult) @@ -436,6 +436,7 @@ export default { watch: { sample: { handler(newVal, oldVal) { + this.resultDisplay = [] if (newVal.sampleId) { this.getSampleDetail() } else { @@ -447,8 +448,8 @@ export default { }, analyseCurrentSpectrum: { handler(newVal, oldVal) { - this.currResultDisplay = newVal.XeData - this.resultDisplay = newVal.XeData + // this.currResultDisplay = newVal.XeData + this.resultDisplay = newVal.XeData || [] }, immediate: true, deep: true,