From 8798ac5b6622acb855dd7acfbe59512f90d3f8c0 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 23 Aug 2024 15:27:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=BB=BA=E5=8F=B0=E7=AB=99?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=97=B6=EF=BC=8C=E5=9C=A8=E9=9D=9Esample?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8B=E9=94=99=E8=AF=AF=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=88=B0=E5=8F=B3=E4=BE=A74=E4=B8=AA=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=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 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue
index 475266b..a5f6529 100644
--- a/src/views/spectrumAnalysis/beta-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-analysis.vue
@@ -215,13 +215,9 @@ export default {
       async handler(newVal, oldVal) {
         const sampleData = getSampleData(newVal.inputFileName)
         if (sampleData) {
-          const { data, from } = sampleData
+          const { data } = sampleData
           this.sampleDetail = data
           this.changeChartByType('sample')
-          if (from == 'db') {
-            this.sampleDetail = data
-          }
-          this.ROIAnalyzeLists = data.ROIAnalyzeLists || []
         } else {
           if (newVal.sampleId) {
             this.getDetailFromDB()
@@ -272,7 +268,7 @@ export default {
         const { success, result, message } = await postAction('/selfStation/Reprocessing', formData)
         if (success) {
           const analyseList = this.getROIAnalyzeListsFromResult(result)
-          this.ROIAnalyzeLists = analyseList
+          this.ROIAnalyzeLists = this.spectraType == 'sample' ? analyseList : []
           updateSampleData({
             inputFileName,
             key: 'ROIAnalyzeLists',
@@ -409,7 +405,7 @@ export default {
       }
     },
 
-    // 获取样品详情
+    // 获取谱详情
     async getDetailFromDB() {
       const { dbName, sampleId, analyst, inputFileName } = this.sample
       try {
@@ -434,7 +430,6 @@ export default {
           })
 
           const analyseList = this.getROIAnalyzeListsFromResult(result.sample)
-          this.ROIAnalyzeLists = analyseList
           updateSampleData({
             inputFileName,
             key: 'ROIAnalyzeLists',