From 515cfe18f112f7c039fb4133e5a4ce6aa21a12bb 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: Mon, 6 Nov 2023 10:22:36 +0800
Subject: [PATCH] =?UTF-8?q?Calibration=20=E7=82=B9=E5=87=BB=20reanalysis?=
 =?UTF-8?q?=20=E6=8C=89=E9=92=AE=E4=B9=8B=E5=90=8E=E5=BE=97=E5=88=B0?=
 =?UTF-8?q?=E6=96=B0=E7=BB=93=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue     |  8 ++++----
 src/views/spectrumAnalysis/index.vue             | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 9e95563..b33e2c4 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -183,15 +183,15 @@ export default {
     sampleInfo: {
       type: Object,
     },
-    // analyseCurrentSpectrum: {
-    //   type: Object,
-    // },
+    analyseCurrentSpectrum: {
+      type: Object,
+    },
   },
   data() {
     this.SampleType = SampleType
 
     return {
-      analyseCurrentSpectrum: {},
+      // analyseCurrentSpectrum: {},
       qcFlags: {},
 
       spectraVisible: false,
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index b143b59..f488485 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -407,7 +407,7 @@ export default {
       isSaving: false,
 
       colorConfig: {}, // 颜色配置
-      sampleInfo:{}
+      sampleInfo: {},
     }
   },
   created() {
@@ -445,12 +445,14 @@ export default {
       this.params_toDB.comment = val.spectrumAnalysisCommentInfo
     },
     getStationName(arg, val, flag) {
-      arg.forEach((item) => {
-        item.conc = parseFloat(Number(item.conc).toPrecision(6))
-        item.concErr = parseFloat(Number(item.concErr).toPrecision(6))
-        item.lc = parseFloat(Number(item.lc).toPrecision(6))
-        item.mdc = parseFloat(Number(item.mdc).toPrecision(6))
-      })
+      if (arg.length > 0) {
+        arg.forEach((item) => {
+          item.conc = parseFloat(Number(item.conc).toPrecision(6))
+          item.concErr = parseFloat(Number(item.concErr).toPrecision(6))
+          item.lc = parseFloat(Number(item.lc).toPrecision(6))
+          item.mdc = parseFloat(Number(item.mdc).toPrecision(6))
+        })
+      }
       this.resultDisplayFlag = arg
       this.params_toDB.stationName = val
       this.isReAnalyed_beta = flag