From 1b4fd2a65a399d7c7af23c546e26e0d8f9dcf92c Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 19 Feb 2025 10:27:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=B0=E7=AB=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A7=A3=E6=9E=90=E4=B8=AD=E6=9F=A5=E6=89=BE?= =?UTF-8?q?Q=E6=96=87=E4=BB=B6=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/phdHelper.js | 6 ++++++ .../components/Modals/LoadFromFileModal.vue | 20 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/utils/phdHelper.js b/src/utils/phdHelper.js index 1efbf43..900fef6 100644 --- a/src/utils/phdHelper.js +++ b/src/utils/phdHelper.js @@ -78,6 +78,11 @@ export class PHDParser { */ isSample = false + /** + * 台站名 + */ + stationName = '' + /** * 构造函数 * @param {string} text @@ -109,6 +114,7 @@ export class PHDParser { } else { this.sampleFilePrefix = this.getGammaFilePrefix(headerInfo[2]) } + this.stationName = this.sampleFilePrefix.slice(0, this.sampleFilePrefix.indexOf('-')) } else { const filePrefixes = this.getFilePrefixes(headerInfo[2]) this.sampleFilePrefix = filePrefixes.splice(0, 1)[0] diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue index e03fda9..0f6a3ab 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue @@ -422,6 +422,14 @@ export default { return } + // 清空该行 + Object.assign(record, { + sampleFileName: undefined, + gasFileName: undefined, + detFileName: undefined, + qcFileName: undefined, + }) + const { sampleFilePrefix, otherFilePrefixes, qualify, liveTime } = phdParser const fileName = `${sampleFilePrefix}S_${qualify}_${liveTime}.PHD` record.sampleFileName = { @@ -473,14 +481,16 @@ export default { file: undefined, fileName: `${sampleFilePrefix}Q.PHD`, } - const qcFileList = fileList.filter((file) => file.name.includes('_Q_')) + const qcFileList = fileList.filter((file) => { + const fileName = file.name + return fileName.startsWith(phdParser.stationName) && fileName.includes('_Q_') + }) for (const qcFile of qcFileList) { if (qcFile.name.slice(0, 23) <= sampleFilePrefix) { qcFileInfo = { file: qcFile, fileName: qcFile.name, } - } else { break } } @@ -528,14 +538,16 @@ export default { file: undefined, fileName: `${sampleFilePrefix}Q.PHD`, } - const qcFileList = fileList.filter((file) => file.name.includes('_Q_')) + const qcFileList = fileList.filter((file) => { + const fileName = file.name + return fileName.startsWith(phdParser.stationName) && fileName.includes('_Q_') + }) for (const qcFile of qcFileList) { if (qcFile.name.slice(0, 23) <= sampleFilePrefix) { qcFileInfo = { file: qcFile, fileName: qcFile.name, } - } else { break } }