From bffa0f3678ea4d94fe8fc62ef875a63fcb77b17f Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Tue, 16 Jul 2024 19:21:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0beta=20=E5=A2=9E=E5=8A=A0qc?= =?UTF-8?q?=E8=B0=B1=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-analysis.vue | 3 ++- .../components/Modals/LoadFromFileModal.vue | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue index 6f89a97..94fc2db 100644 --- a/src/views/spectrumAnalysis/beta-analysis.vue +++ b/src/views/spectrumAnalysis/beta-analysis.vue @@ -289,10 +289,11 @@ export default { // }, async getSelfStationSampleDetail() { this.spectraType = this.SampleType[0].value - const { inputFileName, detFileName } = this.sample + const { inputFileName, detFileName,qcFileName } = this.sample let params = { sampleFileName: inputFileName, detFileName: detFileName, + qcFileName: qcFileName, // sampleFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD', // detFileName: detFileName || 'ABC01_001-20240108_1327_D_FULL_381505.PHD', } diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue index d953c51..e73a455 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue @@ -513,6 +513,23 @@ export default { } } }) + // 查找 QC 文件 + let qcFileInfo = { + file: undefined, + fileName: `${sampleFilePrefix}Q.PHD`, + } + const qcFileList = fileList.filter((file) => file.name.includes('_Q_')) + for (const qcFile of qcFileList) { + if (qcFile.name.slice(0, 23) <= sampleFilePrefix) { + qcFileInfo = { + file: qcFile, + fileName: qcFile.name, + } + } else { + break + } + } + record.qcFileName = qcFileInfo } else { Object.assign(record, { gasFileName: undefined,