From f6a7547aff0c0f8a136b0025b9646c14e834b2c5 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 13 Mar 2024 18:50:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=88=86=E6=9E=90Beta=E8=B0=B1=E6=97=B6=EF=BC=8C=E5=8F=B3?= =?UTF-8?q?=E4=B8=8B=E8=A7=92Result=20Display=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=8A=E5=9C=A8=E4=BB=8E=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=88=86=E6=9E=90=E5=90=8E=E7=9A=84=E8=B0=B1=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=B0=B1=EF=BC=8CResult=20Display=E5=80=BC=E4=B8=8D=E5=8F=98?= =?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 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 3eb0809..dd7150c 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -134,6 +134,7 @@ import PopOverWithIcon from './components/SubOperators/PopOverWithIcon.vue' import Spectra from './components/SubOperators/Spectra.vue' import CustomSelect from '@/components/CustomSelect/index.vue' import axios from 'axios' +import { cloneDeep } from 'lodash' const StatisticsType = { 'Collection Time': 'Colloc_Time', @@ -225,7 +226,6 @@ export default { statisticModalVisible: false, // Qc Flags 点击后的弹窗 statisticsType: StatisticsType['Collection Time'], currSample: {}, - copyXeData: null, qcFlagsVisible: false, } }, @@ -452,12 +452,7 @@ export default { console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay) - this.resultDisplay = this.copyXeData - ? this.copyXeData - : this.resultDisplay.length > 0 - ? this.resultDisplay - : XeData - + this.resultDisplay = XeData this.sortResultDisplay() this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult) @@ -561,8 +556,6 @@ 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) } } else { @@ -683,7 +676,7 @@ export default { analyseCurrentSpectrum: { handler(newVal, oldVal) { // this.currResultDisplay = newVal.XeData - this.resultDisplay = newVal.XeData || [] + this.resultDisplay = cloneDeep(newVal.XeData) || [] this.sortResultDisplay() this.$store.commit('UPDATE_SAMPLE_DATA', { inputFileName: this.sample.inputFileName,