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 = ''