From d57dcfa147e04a83379a987fc682e80e21e82782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 15 Nov 2023 09:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E7=9A=84=20getDBSpectrumChart=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20analyst=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 308b33e..dd9c46c 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -242,19 +242,24 @@ export default {
         this.sampleDetail[item.value].Boundary = value || []
       })
 
-      const mapper = [{
-        key: 'sample',
-        sampleType: 'sample'
-      }, {
-        key: 'gas',
-        sampleType: 'gasBg'
-      }, {
-        key: 'det',
-        sampleType: 'detBg'
-      }, {
-        key: 'qc',
-        sampleType: 'qc'
-      }]
+      const mapper = [
+        {
+          key: 'sample',
+          sampleType: 'sample',
+        },
+        {
+          key: 'gas',
+          sampleType: 'gasBg',
+        },
+        {
+          key: 'det',
+          sampleType: 'detBg',
+        },
+        {
+          key: 'qc',
+          sampleType: 'qc',
+        },
+      ]
 
       const dimension = ['beta', 'gamma'] // sampleDatail的key的维度
       const dimension2 = ['Beta', 'Gamma'] // 返回值的key的维度
@@ -264,16 +269,14 @@ export default {
           const key = `${mapper[i].key}${dimension2[j]}EnergyData` // 返回的result中的key，形如 gasBetaEnergyData
           const value = result[key]
           // 如果有值，将值赋给相应的sampleDetail中的谱的energy
-          if(value) {
+          if (value) {
             const dimensionKey = dimension[j]
             const sampleType = mapper[i].sampleType
             this.sampleDetail[sampleType][`${dimensionKey}EnergyData`] = value
           }
         }
-        
       }
 
-
       this.changeChartByType(this.spectraType)
     },
 
@@ -288,7 +291,7 @@ export default {
     async getSampleDetail() {
       this.spectraType = this.SampleType[0].value
 
-      const { dbName, sampleId, inputFileName } = this.sample
+      const { dbName, sampleId, inputFileName, analyst } = this.sample
       try {
         this.isLoading = true
         this.cancelLastRequest()
@@ -298,6 +301,7 @@ export default {
           {
             dbName,
             sampleId,
+            analyst,
           },
           cancelToken
         )