From bbf9c1d783e7883a2bb5ec9fd295071337c312e7 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 10 Oct 2024 09:59:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=BB=BA?=
 =?UTF-8?q?=E5=8F=B0=E7=AB=99=E7=9B=B8=E4=BA=92=E5=88=87=E6=8D=A2=E6=97=B6?=
 =?UTF-8?q?XeData=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/beta-analysis.vue    | 17 +++++++++++++++--
 .../components/Modals/LoadFromFileModal.vue     |  4 +++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue
index 6c665cd..01af523 100644
--- a/src/views/spectrumAnalysis/beta-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-analysis.vue
@@ -215,16 +215,22 @@ export default {
       async handler(newVal, oldVal) {
         const sampleData = getSampleData(newVal.inputFileName)
         if (sampleData) {
+          this.cancelLastRequest()
+          this.isLoading = false
           const { data } = sampleData
+          console.log('%c [ data ]-221', 'font-size:13px; background:pink; color:#bf2c9f;', data)
           this.sampleDetail = data
           this.changeChartByType('sample')
+          // 更新XeData
+          this.resultDisplay = data.XeData
         } else {
+          this.resultDisplay = []
+          this.ROIAnalyzeLists = []
           if (newVal.sampleId) {
             this.getDetailFromDB()
           } else {
             this.getDetailFromFile()
           }
-          this.ROIAnalyzeLists = []
         }
       },
       immediate: true,
@@ -275,6 +281,12 @@ export default {
             data: analyseList,
           })
 
+          updateSampleData({
+            inputFileName,
+            key: 'XeData',
+            data: result.XeData,
+          })
+
           // 更新XeData
           this.resultDisplay = result.XeData
         } else {
@@ -458,7 +470,7 @@ export default {
     },
 
     changeChartByType(val) {
-      const currSampleDetail = this.sampleDetail[this.spectraType]
+      const currSampleDetail = this.sampleDetail[val]
       if (!currSampleDetail) {
         this.$message.warning(`No ${this.spectraType} spectrum file!`)
         this.$nextTick(() => {
@@ -468,6 +480,7 @@ export default {
       }
 
       this.prevSpectraType = val
+      this.spectraType = val
 
       if (val == 'sample') {
         this.currSpectrum = 'Sample'
diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
index 266980c..e03fda9 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
@@ -485,7 +485,9 @@ export default {
                 }
               }
               record.qcFileName = qcFileInfo
-            } else if (phdParser.fileType == 'C') {
+            }
+            // 如果是自建台站，也查找其他文件
+            else if (phdParser.fileType == 'C') {
               const iter = await this.directoryHanlder.values()
               const fileList = []