From adeb7830cb9c13c2db7aad2f823ccc5549a90b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= Date: Mon, 16 Nov 2020 19:09:00 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20tooltip=E6=95=B0=E5=AD=97=E5=B0=8F?= =?UTF-8?q?=E4=BA=8E0.01=E6=97=B6=E4=BD=BF=E7=94=A8=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/charts/chartPreview.vue | 4 ++-- .../src/components/charts/line-chart-block.vue | 15 +++++++++++---- .../common/project/popData/lineChart.vue | 6 +++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index 531d998e7..c13fb5ba1 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -783,7 +783,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; @@ -957,7 +957,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index aeff03d0d..35e5d6c59 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -622,7 +622,7 @@ } let val =item.data[1]?parseFloat(Number(item.data[1]).toFixed(2)):''; if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; @@ -740,7 +740,14 @@ axisLabel: { show:true, fontSize: 10, - formatter: function(value,index){ + formatter: function(val,index){ + let value = val; + if (val !== 0) { + value = parseFloat(Number(val).toFixed(2)); + if(value === 0){ + value = Number(val).toExponential(2); + } + } let chartUnit=chartInfo.unit; chartUnit=chartUnit?chartUnit:2; let unit=chartDataFormat.getUnit(chartUnit); @@ -850,7 +857,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; @@ -985,7 +992,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; diff --git a/nezha-fronted/src/components/common/project/popData/lineChart.vue b/nezha-fronted/src/components/common/project/popData/lineChart.vue index cc6279aa3..e2a9d61fe 100644 --- a/nezha-fronted/src/components/common/project/popData/lineChart.vue +++ b/nezha-fronted/src/components/common/project/popData/lineChart.vue @@ -585,7 +585,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; @@ -843,7 +843,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`; @@ -974,7 +974,7 @@ } let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ - val = Number(item.data[1]); + val = Number(item.data[1]).toExponential(2); } sum +=val; str += `
`;