From 2f3947e6cff3c7954ba4c97ce7741ea248440e14 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 8 Nov 2023 17:44:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E4=B8=BAnull=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BetaGammaEnergyCalibrationModal/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue index 04e6d31..6f16c6c 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -111,12 +111,12 @@ export default { const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName)) matchedSampleList.forEach( - ({ dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => { + ({ dbName, sampleId, inputFileName, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => { dbNames.push(dbName || '') sampleIds.push(sampleId || '') - sampleFileNames.push(sampleFileName) - gasFileNames.push(gasFileName) - detFileNames.push(detFileName) + sampleFileNames.push(sampleFileName || inputFileName || '') + gasFileNames.push(gasFileName || '') + detFileNames.push(detFileName || '') qcFileNames.push(qcFileStatus ? qcFileName : '') } )