From 50c8c0d4d2c7c38c2f7f7389bdfb65f9bbcd278f Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 3 Nov 2023 15:22:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9table=E7=9A=84size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NuclideReviewModal.vue                            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue
index 3dad52f..4611171 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewModal.vue
@@ -66,6 +66,7 @@
             :scroll="{ y: 180 }"
             :customRow="customRow"
             :pagination="false"
+            size="small"
           >
             <template slot="keyLine" slot-scope="text">
               <span v-if="text == 1" class="green-check-mark"> </span>

From 449570f171477dd14420f8118622cbeb7dd51670 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: Fri, 3 Nov 2023 17:05:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/NuclideActivityAndMDCModal.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
index d913f40..bab05c3 100644
--- a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
@@ -106,14 +106,14 @@ const columns = [
     title: 'Conc (uBq/m3)',
     dataIndex: 'conc',
     customRender: (text) => {
-      return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
+      return text && text !== 'null' ? Number(text).toPrecision(6) : text
     },
   },
   {
     title: 'MDC (uBq/m3)',
     dataIndex: 'mdc',
     customRender: (text) => {
-      return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
+      return text && text !== 'null' ? Number(text).toPrecision(6) : text
     },
   },
 ]

From af9c537f34914799c69798433348daa1f764ede1 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 3 Nov 2023 18:02:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Daccept=E5=90=8Epea?=
 =?UTF-8?q?k=E5=80=BC=E4=B8=8D=E5=AF=B9=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/gamma-analysis.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index e43ad7c..6d9bc99 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1382,7 +1382,7 @@ export default {
 
     // 分析工具Accept时刷新部分数据
     handleAccept(data) {
-      const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
+      const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
 
       const result = {
         DetailedInformation: this.detailedInfomation,
@@ -1392,7 +1392,7 @@ export default {
         shadowEnergyChart,
         shapeChannelData,
         shapeEnergyData,
-        peak: peakSet,
+        peak,
         BaseCtrls: this.baseCtrls,
         bAnalyed: this.bAnalyed,
         barChart

From 91a580ec8cd67c57ec51dde1b21541ac16d4e3d6 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: Fri, 3 Nov 2023 18:10:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?save=20to=20db=20=E4=B9=8B=E5=90=8E=20?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=9B=9E=E6=98=BE=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=20Sample=20ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/beta-gamma-analysis.vue | 11 +++++++++++
 src/views/spectrumAnalysis/index.vue               |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index da5f89e..9e95563 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -180,6 +180,9 @@ export default {
     sample: {
       type: Object,
     },
+    sampleInfo: {
+      type: Object,
+    },
     // analyseCurrentSpectrum: {
     //   type: Object,
     // },
@@ -542,6 +545,14 @@ export default {
       immediate: true,
       deep: true,
     },
+    sampleInfo: {
+      handler(newVal, oldVal) {
+        this.spectrumData.sampleId = newVal.sampleId
+        this.spectrumData.status = newVal.status
+      },
+      immediate: true,
+      deep: true,
+    },
   },
 }
 </script>
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index fbb28f1..b143b59 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -51,6 +51,7 @@
         @sendInfo="getStationName"
         @reAnalyCurr="getReAnalyCurr"
         @reAnalyAll="getReAnalyAll"
+        :sampleInfo="sampleInfo"
         :sample="sampleData"
         :analyseCurrentSpectrum="analyseCurrentSpectrumData"
       />
@@ -406,6 +407,7 @@ export default {
       isSaving: false,
 
       colorConfig: {}, // 颜色配置
+      sampleInfo:{}
     }
   },
   created() {
@@ -641,6 +643,7 @@ export default {
             if (res.success) {
               this.$message.success('Save Successfully!')
               this.isSaving = false
+              this.sampleInfo = res.result.sample
             } else {
               this.isSaving = false
               this.$message.warning(`${res.message}`)