From 520c020df9fb60a206e3510ebdf18c46453bb0f2 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 29 Sep 2020 14:05:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BD=93=E4=BC=A0=E7=9A=84=E5=80=BC?= =?UTF-8?q?=E6=98=AFnull=20=E6=97=B6=20=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/charts/chartDataFormat.js | 3 +++ nezha-fronted/src/components/charts/line-chart-block.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index 44a9481d4..be303573d 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -323,6 +323,9 @@ function days(value,index,type=1,dot){ * dot:保留的小数位, * */ function asciiCompute(num,ascii,units,dot=2){ + if(!num && num!==0 && num!=='0'){ + return '' + } num=Number(num) let carry=0; if(num > 1){ diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index d60646d57..705a2edcc 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -619,7 +619,7 @@ + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); str +=`
`; } - let val = parseFloat(Number(item.data[1]).toFixed(2)); + let val =item.data[1]?parseFloat(Number(item.data[1]).toFixed(2)):''; if(val===0){ val = Number(item.data[1]); }