diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue index de727f6..9af9a0b 100644 --- a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue @@ -63,58 +63,34 @@ const columns = [ { title: 'Energy (keV)', dataIndex: 'energy', - customRender: (text) => { - return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text - }, }, { title: 'Yield (%)', dataIndex: 'yield', - customRender: (text) => { - return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text - }, }, { title: 'Efficiency', dataIndex: 'efficiency', - customRender: (text) => { - return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text - }, }, { title: 'Activity (Bq)', dataIndex: 'activity', - customRender: (text) => { - return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text - }, }, { title: 'Act Err (%)', dataIndex: 'actErr', - customRender: (text) => { - return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text - }, }, { title: 'MDA (Bq)', dataIndex: 'mda', - customRender: (text) => { - return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text - }, }, { title: 'Conc (uBq/m3)', dataIndex: 'conc', - customRender: (text) => { - return text - }, }, { title: 'MDC (uBq/m3)', dataIndex: 'mdc', - customRender: (text) => { - return text - }, }, ] export default { diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue index 235ee40..47bc23d 100644 --- a/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue @@ -151,25 +151,25 @@ const mainColumns = [ title: 'Energy(keV)', dataIndex: 'energy', width: 100, - customRender: (text) => parseFloat(Number(text).toPrecision(6)), + customRender: (text) => Number(text).toFixed(3), }, { title: 'Energy Uncert(%)', dataIndex: 'energyUncert', width: 120, - customRender: (text) => parseFloat(Number(text * 100).toPrecision(6)), + customRender: (text) => Number(text).toFixed(6), }, { title: 'Yield', dataIndex: 'yield', width: 80, - customRender: (text) => parseFloat(Number(text).toPrecision(6)), + customRender: (text) => Number(text).toFixed(3), }, { title: 'Yield Uncert(%)', dataIndex: 'yieldUncert', width: 120, - customRender: (text) => parseFloat(Number(text).toPrecision(6)), + customRender: (text) => Number(text).toFixed(3), }, { title: 'KeyLine', diff --git a/src/views/spectrumAnalysis/components/PeakInfomation.vue b/src/views/spectrumAnalysis/components/PeakInfomation.vue index 128cad0..f88c729 100644 --- a/src/views/spectrumAnalysis/components/PeakInfomation.vue +++ b/src/views/spectrumAnalysis/components/PeakInfomation.vue @@ -47,12 +47,10 @@ const columns = [ { title: 'Energy(keV)', dataIndex: 'energy', - customRender: (text) => parseFloat(Number(text).toPrecision(6)), }, { title: 'Centroid', dataIndex: 'centroid', - customRender: (text) => parseFloat(Number(text).toPrecision(6)), }, { title: 'Multiplet', @@ -61,31 +59,24 @@ const columns = [ { title: 'Fwhm(keV)', dataIndex: 'fwhm', - customRender: (text) => parseFloat(Number(text).toPrecision(6)), }, { title: 'NetArea', dataIndex: 'netArea', 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) => text, }, { title: 'Significant', dataIndex: 'significant', - customRender: (text) => parseFloat(Number(text).toPrecision(6)), }, { title: 'Sensitivity', dataIndex: 'sensitivity', - customRender: (text) => parseFloat(Number(text).toPrecision(6)), }, { title: 'Indentify',