From c493d0abdc565b4b03c779d3d8445dff7fc7e43f Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Tue, 17 Oct 2023 15:26:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Gamma=E7=9A=84Calibration=E5=88=9D?=
 =?UTF-8?q?=E6=AD=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modals/EfficiencyCalibrationModal.vue     | 20 +++++++++++--------
 .../Modals/EnergyCalibrationModal.vue         | 18 ++++++++++-------
 .../Modals/ResolutionCalibrationModal.vue     | 18 ++++++++++-------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
index 8b94e10..b1f024b 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" destroy-on-close>
+  <custom-modal v-model="visible" :width="1280" title="Efficiency Calibration" :footer="null">
     <a-spin :spinning="isLoading">
       <div class="energy-calibration">
         <div class="left">
@@ -125,19 +125,23 @@ import { showSaveFileModal } from '@/utils/file'
 const columns = [
   {
     title: 'Energy(keV)',
-    dataIndex: 'energy'
+    dataIndex: 'energy',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Efficiency',
-    dataIndex: 'efficiency'
+    dataIndex: 'efficiency',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Fit(keV)',
-    dataIndex: 'fit'
+    dataIndex: 'fit',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Delta(%)',
-    dataIndex: 'delta'
+    dataIndex: 'delta',
+    customRender: (text) => Number(text).toFixed(3)
   }
 ]
 
@@ -282,11 +286,11 @@ export default {
         })
         this.isLoading = false
         if (success) {
-          const { list_dataSource, ECutAnalysis_Low, G_energy_span } = result
+          const { list_dataSource, ECutAnalysis_Low, G_energy_span, currentText: resultCurrentText } = result
           this.dataSourceList = list_dataSource
           if (!currentText) {
-            this.currSelectedDataSource = list_dataSource[list_dataSource.length - 1]
-            this.appliedDataSource = list_dataSource[list_dataSource.length - 1]
+            this.currSelectedDataSource = resultCurrentText
+            this.appliedDataSource = resultCurrentText
           }
 
           this.ECutAnalysis_Low = ECutAnalysis_Low
diff --git a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
index 0da4f10..8507ee3 100644
--- a/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
@@ -120,19 +120,23 @@ import { showSaveFileModal } from '@/utils/file'
 const columns = [
   {
     title: 'Channel',
-    dataIndex: 'channel'
+    dataIndex: 'channel',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Energy(keV)',
-    dataIndex: 'energy'
+    dataIndex: 'energy',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Fit(keV)',
-    dataIndex: 'fit'
+    dataIndex: 'fit',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Delta(%)',
-    dataIndex: 'delta'
+    dataIndex: 'delta',
+    customRender: (text) => Number(text).toFixed(3)
   }
 ]
 
@@ -244,11 +248,11 @@ export default {
         })
         this.isLoading = false
         if (success) {
-          const { list_dataSource, rg_high, rg_low } = result
+          const { list_dataSource, rg_high, rg_low, currentText: resultCurrentText } = result
           this.dataSourceList = list_dataSource
           if (!currentText) {
-            this.currSelectedDataSource = list_dataSource[list_dataSource.length - 1]
-            this.appliedDataSource = list_dataSource[list_dataSource.length - 1]
+            this.currSelectedDataSource = resultCurrentText
+            this.appliedDataSource = resultCurrentText
           }
 
           this.rg_high = rg_high
diff --git a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
index a092112..ed5afc9 100644
--- a/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
@@ -120,19 +120,23 @@ import { showSaveFileModal } from '@/utils/file'
 const columns = [
   {
     title: 'Energy(keV)',
-    dataIndex: 'energy'
+    dataIndex: 'energy',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'FWHM(keV)',
-    dataIndex: 'fwhm'
+    dataIndex: 'fwhm',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Fit(keV)',
-    dataIndex: 'fit'
+    dataIndex: 'fit',
+    customRender: (text) => Number(text).toFixed(3)
   },
   {
     title: 'Delta(%)',
-    dataIndex: 'delta'
+    dataIndex: 'delta',
+    customRender: (text) => Number(text).toFixed(3)
   }
 ]
 
@@ -243,11 +247,11 @@ export default {
         })
         this.isLoading = false
         if (success) {
-          const { list_dataSource, ECutAnalysis_Low, G_energy_span } = result
+          const { list_dataSource, ECutAnalysis_Low, G_energy_span, currentText: resultCurrentText } = result
           this.dataSourceList = list_dataSource
           if (!currentText) {
-            this.currSelectedDataSource = list_dataSource[list_dataSource.length - 1]
-            this.appliedDataSource = list_dataSource[list_dataSource.length - 1]
+            this.currSelectedDataSource = resultCurrentText
+            this.appliedDataSource = resultCurrentText
           }
 
           this.ECutAnalysis_Low = ECutAnalysis_Low