From 102a4708e883999bdc3d0edfb2accf87ce1f9c26 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 28 Dec 2023 18:05:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/EditCell.vue                |  2 +-
 .../Modals/EfficiencyCalibrationModal.vue         | 15 ++++++++++-----
 .../components/Modals/EnergyCalibrationModal.vue  | 13 +++++++++----
 .../components/Modals/KorsumModal.vue             | 13 +++++++++----
 .../Modals/ResolutionCalibrationModal.vue         | 15 ++++++++++-----
 5 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/EditCell.vue b/src/views/spectrumAnalysis/components/Modals/EditCell.vue
index 5032e41..5174a34 100644
--- a/src/views/spectrumAnalysis/components/Modals/EditCell.vue
+++ b/src/views/spectrumAnalysis/components/Modals/EditCell.vue
@@ -4,7 +4,7 @@
       <a-input ref="myInput" :value="value" @change="handleChange" @blur="handleBlur" />
     </div>
     <div v-else class="editable-cell-text-wrapper" @dblclick="handleCellClick">
-      {{ value || ' ' }}
+      {{ value || 0 }}
     </div>
   </div>
 </template>
diff --git a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
index deea235..4eb65de 100644
--- a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <custom-modal v-model="visible" :width="1280" title="Efficiency Calibration" :footer="null">
+  <custom-modal v-model="visible" :width="1280" title="Efficiency Calibration" :footer="null" destroy-on-close>
     <a-spin :spinning="isLoading">
       <div class="energy-calibration">
         <div class="left">
@@ -116,26 +116,31 @@ import { buildLineSeries } from '@/utils/chartHelper'
 import SampleDataMixin from '../../SampleDataMixin'
 import { showSaveFileModal } from '@/utils/file'
 
+const format = (text) => {
+  const num = parseFloat(text)
+  return (!num? '-': '') + Number(text).toFixed(3)
+}
+
 const columns = [
   {
     title: 'Energy(keV)',
     dataIndex: 'energy',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Efficiency',
     dataIndex: 'efficiency',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Fit(keV)',
     dataIndex: 'fit',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Delta(%)',
     dataIndex: 'delta',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
 ]
 
diff --git a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
index ef52148..f132a09 100644
--- a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
@@ -111,26 +111,31 @@ import { buildLineSeries } from '@/utils/chartHelper'
 import SampleDataMixin from '../../SampleDataMixin'
 import { showSaveFileModal } from '@/utils/file'
 
+const format = (text) => {
+  const num = parseFloat(text)
+  return (!num? '-': '') + Number(text).toFixed(3)
+}
+
 const columns = [
   {
     title: 'Channel',
     dataIndex: 'channel',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Energy(keV)',
     dataIndex: 'energy',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Fit(keV)',
     dataIndex: 'fit',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Delta(%)',
     dataIndex: 'delta',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
 ]
 
diff --git a/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue b/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue
index 734317e..456baa9 100644
--- a/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue
@@ -77,16 +77,16 @@
               :pagination="false"
             >
               <template slot="energy" slot-scope="text, record">
-                <a-input-number v-model="record.energy"></a-input-number>
+                <a-input v-model="record.energy"></a-input>
               </template>
               <template slot="totalEffi" slot-scope="text, record">
-                <a-input-number v-model="record.totalEffi"></a-input-number>
+                <a-input v-model="record.totalEffi"></a-input>
               </template>
               <template slot="peakEffi" slot-scope="text, record">
-                <a-input-number v-model="record.peakEffi"></a-input-number>
+                <a-input v-model="record.peakEffi"></a-input>
               </template>
               <template slot="uncertain" slot-scope="text, record">
-                <a-input-number v-model="record.uncertain"></a-input-number>
+                <a-input v-model="record.uncertain"></a-input>
               </template>
             </a-table>
             <!-- 表格结束 -->
@@ -238,6 +238,11 @@ export default {
         this.isLoading = false
         if (success) {
           const { Energy, Nuclide } = result
+          Energy.forEach(item => {
+            item.totalEffi = Number(item.totalEffi).toPrecision(4)
+            item.peakEffi = Number(item.peakEffi).toPrecision(4)
+            item.uncertain = Number(item.uncertain).toFixed(1)
+          })
           this.list = Energy
           this.nuclideList = Nuclide
         } else {
diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
index 2278599..d957310 100644
--- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
@@ -111,26 +111,31 @@ import { buildLineSeries } from '@/utils/chartHelper'
 import SampleDataMixin from '../../SampleDataMixin'
 import { showSaveFileModal } from '@/utils/file'
 
+const format = (text) => {
+  const num = parseFloat(text)
+  return (!num? '-': '') + Number(text).toFixed(3)
+}
+
 const columns = [
   {
     title: 'Energy(keV)',
     dataIndex: 'energy',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'FWHM(keV)',
     dataIndex: 'fwhm',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Fit(keV)',
     dataIndex: 'fit',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
   {
     title: 'Delta(%)',
     dataIndex: 'delta',
-    customRender: (text) => parseFloat(Number(text).toPrecision(6)),
+    customRender: (text) => format(text),
   },
 ]
 
@@ -158,7 +163,7 @@ const initialOption = {
       const energy = parseInt(x)
       const fwhm = y.toFixed(3)
       return `<div class="channel">Energy: ${energy}</div>
-              <div class="energy">Efficiency : ${efficiency}</div>`
+              <div class="energy">Efficiency : ${fwhm}</div>`
     },
     className: 'figure-chart-option-tooltip',
   },