From fe748ee4ce34a7405509e0617a07e0ad255ff5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Wed, 18 Oct 2023 13:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=AC=E5=9C=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20=E5=88=86=E6=9E=90=E4=B9=8B=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=88=87=E6=8D=A2=E8=B0=B1=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=20=E5=8F=B3=E4=B8=8B=E8=A7=92=E7=9A=84=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B9=9F=E8=A2=AB=E6=B8=85=E7=A9=BA=E4=BA=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-gamma-analysis.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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,