From e89afcba1b539dbb2b9506b83453a754d68aec78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 19 Oct 2023 19:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E9=80=89=E5=88=97=E8=A1=A8=E8=A6=81?= =?UTF-8?q?=E7=94=A8=E8=A1=A8=E6=A0=BC=E9=87=8C=E9=9D=A2=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E8=A6=81=E7=94=A8=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E5=90=8E=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/LoadFromFileModal.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue index 57a895b..43da5ea 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue @@ -645,7 +645,7 @@ export default { if (value && value.file) { fileObj[propStatus[index]] = true files.push(value.file) - fileObj.files.push(value.file) + fileObj.files.push(value.fileName) } else { fileObj[propStatus[index]] = false } @@ -668,27 +668,27 @@ export default { if (el.fileType == 'B') { obj.sampleSystemType = el.fileType el.files.forEach((item) => { - if (item.name.search('_S_')) { - obj.sampleFileName = item.name + if (item.search('_S_')) { + obj.sampleFileName = item } - if (item.name.search('_G_')) { - obj.gasFileName = item.name + if (item.search('_G_')) { + obj.gasFileName = item obj.gasFileStatus = el.gasFileStatus } - if (item.name.search('_D_')) { - obj.detFileName = item.name + if (item.search('_D_')) { + obj.detFileName = item obj.detFileStatus = el.detFileStatus } - if (item.name.search('_Q_')) { - obj.qcFileName = item.name + if (item.search('_Q_')) { + obj.qcFileName = item obj.qcFileStatus = el.qcFileStatus } }) } else { el.files.forEach((item) => { - if (item.name.search('_S_')) { + if (item.search('_S_')) { obj.sampleSystemType = el.fileType - obj.sampleFileName = item.name + obj.sampleFileName = item obj.gasFileName = '' obj.detFileName = '' obj.qcFileName = ''