From e635fb33ae0bae9aba2c31ba14eac1a6c6a8d26a Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 13 Oct 2020 10:57:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=BD=93?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=80=BC=E6=9C=89=E8=B4=9F=E6=95=B0=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/charts/line-chart-block.vue | 13 ++++++++----- .../common/project/popData/lineChart.vue | 13 ++++++++----- .../components/page/dashboard/overview/chart.vue | 16 +++++++++------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 6ebe45894..d7ebfcdab 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -1648,19 +1648,22 @@ let maxValue=0; let minValue=0; if(chartInfo.unit &&dataArg.length>0){ - maxValue=dataArg[0].data[0][1]; - minValue=dataArg[0].data[0][1]; + maxValue=0; + minValue=0; for(let j = 0; j < dataArg.length ; j++){ for (let i = 0; i < dataArg[j].data.length - 1; i++) { - maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue); - minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue); + if(dataArg[j].data[i+1][1]!=='NaN'){ + maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue); + minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue); + } } } } let chartUnit=chartInfo.unit?chartInfo.unit:2; let unit=chartDataFormat.getUnit(chartUnit); + minValue=minValue>0?0:minValue; + maxValue=maxValue-minValue; maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); - minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii); let oldValue=maxValue; let dot=0; if(maxValue==1){ diff --git a/nezha-fronted/src/components/common/project/popData/lineChart.vue b/nezha-fronted/src/components/common/project/popData/lineChart.vue index bdee3a7a0..662a04ac8 100644 --- a/nezha-fronted/src/components/common/project/popData/lineChart.vue +++ b/nezha-fronted/src/components/common/project/popData/lineChart.vue @@ -1514,19 +1514,22 @@ let maxValue=0; let minValue=0; if(chartInfo.unit &&dataArg.length>0){ - maxValue=dataArg[0].data[0][1]; - minValue=dataArg[0].data[0][1]; + maxValue=0; + minValue=0; for(let j = 0; j < dataArg.length ; j++){ for (let i = 0; i < dataArg[j].data.length - 1; i++) { - maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue); - minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue); + if(dataArg[j].data[i+1][1]!=='NaN'){ + maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue); + minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue); + } } } } let chartUnit=chartInfo.unit?chartInfo.unit:2; let unit=chartDataFormat.getUnit(chartUnit); + minValue=minValue>0?0:minValue; + maxValue=maxValue-minValue; maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); - minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii); let oldValue=maxValue; let dot=0; if(maxValue==1){ diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index da7ae54d1..1e7440fc4 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -412,19 +412,22 @@ let maxValue=0; let minValue=0; if(chartInfo.unit &&dataArg.length>0){ - maxValue=dataArg[0].data[0][1]; - minValue=dataArg[0].data[0][1]; + maxValue=0; + minValue=0; for(let j = 0; j < dataArg.length ; j++){ for (let i = 0; i < dataArg[j].data.length - 1; i++) { - maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue); - minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue); + if(dataArg[j].data[i+1][1]!=='NaN'){ + maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue); + minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue); + } } } } let chartUnit=chartInfo.unit?chartInfo.unit:2; let unit=chartDataFormat.getUnit(chartUnit); + minValue=minValue>0?0:minValue; + maxValue=maxValue-minValue; maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); - minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii); let oldValue=maxValue; let dot=0; if(maxValue==1){ @@ -443,7 +446,6 @@ dot++; } let copies=chartDataFormat.copies(oldValue,unit.type); - // console.log(oldValue,copies,maxValue); let oldDot=2; if(maxValue<=1){ oldDot=dot>6?6:dot; @@ -456,7 +458,7 @@ unit, oldDot } - } + }, }, mounted() { this.chartInit();