From 330238aead0b25e3abb6315ffd617cafd83a93ad Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Sun, 29 Sep 2024 13:49:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E6=96=87=E4=BB=B6=E5=A4=B9=E5=8A=A0=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=BB=BA=E5=8F=B0=E7=AB=99=EF=BC=8C=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=90=8E=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/LoadFromFileModal.vue   |  4 ++++
 src/views/spectrumAnalysis/index.vue          | 24 +++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

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)