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',