From e7d06e2ae8e1cc7bbbf8b2f9013e2f1972c58728 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: Tue, 21 Nov 2023 15:08:39 +0800
Subject: [PATCH] =?UTF-8?q?Radionuclide=20Activity=20=E4=B8=AD=E7=9A=84=20?=
 =?UTF-8?q?conc=20=E5=92=8C=20mdc=20=E4=B8=AD=E9=97=B4=E7=9A=84=20?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8D=E5=AF=B9=20peak=20Infomation=201544771.536?=
 =?UTF-8?q?=20=E6=80=8E=E4=B9=88=E5=8F=98=E6=88=90=E4=BA=861544770=20?=
 =?UTF-8?q?=EF=BC=88CNP21=5F001-20170129=5F0220=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/NuclideActivityAndMDCModal.vue       | 4 ++--
 src/views/spectrumAnalysis/components/PeakInfomation.vue   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
index bab05c3..de727f6 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' ? Number(text).toPrecision(6) : text
+      return text
     },
   },
   {
     title: 'MDC (uBq/m3)',
     dataIndex: 'mdc',
     customRender: (text) => {
-      return text && text !== 'null' ? Number(text).toPrecision(6) : text
+      return text
     },
   },
 ]
diff --git a/src/views/spectrumAnalysis/components/PeakInfomation.vue b/src/views/spectrumAnalysis/components/PeakInfomation.vue
index e01fd21..128cad0 100644
--- a/src/views/spectrumAnalysis/components/PeakInfomation.vue
+++ b/src/views/spectrumAnalysis/components/PeakInfomation.vue
@@ -66,13 +66,16 @@ const columns = [
   {
     title: 'NetArea',
     dataIndex: 'netArea',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    ellipsis: true,
+    // customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => text,
   },
   {
     title: 'AreaErr(%)',
     dataIndex: 'areaErr',
     ellipsis: true,
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    // customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => text,
   },
   {
     title: 'Significant',