diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue index 4e2d00e..9dda8bc 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue @@ -755,6 +755,10 @@ export default { obj.detFileName = item obj.detFileStatus = el.detFileStatus } + if (item.includes('_Q_')) { + obj.qcFileName = item + obj.qcFileStatus = el.qcFileStatus + } }) } else { el.files.forEach((item) => { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 5f91b90..066d3a8 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -581,24 +581,18 @@ export default { this.$refs.gammaAnalysisRef.handleDBFileSelect(sample.sampleId, true) } }, + // 从本地目录加载谱文件 handleLoadSampleFromFile(sampleList) { - let arr = sampleList.filter((item) => { - if (Object.keys(item).length > 4) { - if (item.gasFileName && item.detFileName && item.gasFileStatus && item.detFileStatus) { - return item - } else if (!item.gasFileName && !item.detFileName && !item.qcFileName) { - return item - } else { - return item - } + const arr = sampleList.map((item) => { + return { + ...item, + dbName: '', + sampleId: null, + inputFileName: item.sampleFileName, + sampleType: item.sampleSystemType, } }) - arr.forEach((item) => { - item.dbName = '' - item.sampleId = null - item.inputFileName = item.sampleFileName - item.sampleType = item.sampleSystemType - }) + const names = this.sampleList.map((item) => item.inputFileName) // 当前Sample列表中的所有inputFileName const willAddList = arr.filter((item) => !names.includes(item.inputFileName)) this.callInitValue(willAddList)