gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：处理Y轴最大值 最小值的精度问题

Browse Source
This commit is contained in:
zhangyu
2020-09-22 17:06:13 +08:00
parent 9e6643bf80
commit 32cadf74da
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nezha-fronted/src/components/charts/chartDataFormat.js
View File

@@ -700,8 +700,7 @@ export default {
case 10: return 5; case 10: return 5;
} }
}, },
Interval:function(value,copies,type){ Interval:function(value,copies,type,interValType){
console.log(value,'Interval');
if(value<1024&&type==='Data'){ if(value<1024&&type==='Data'){
let interVal=value/copies; let interVal=value/copies;
return interVal return interVal
@@ -721,7 +720,6 @@ export default {
interVal=Math.ceil(interVal)*Math.pow(1024,pow); interVal=Math.ceil(interVal)*Math.pow(1024,pow);
} }
interVal = interVal || 1; interVal = interVal || 1;
console.log(interVal);
return interVal return interVal
} }
if(type==='DataRate' || type==='Misc'){ if(type==='DataRate' || type==='Misc'){
@@ -738,6 +736,9 @@ export default {
console.log(interVal); console.log(interVal);
return interVal return interVal
} }
if(interValType==='max'){
return value
}
return 1; return 1;
// let interVal=value/copies; // let interVal=value/copies;
// interVal = interVal || 1; // interVal = interVal || 1;

11
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -496,16 +496,17 @@
console.log(chartInfo, dataArg, chartSite,legend); console.log(chartInfo, dataArg, chartSite,legend);
let maxValue=0; let maxValue=0;
let minValue=0; let minValue=0;
if(chartInfo.type==='line' && chartInfo.unit &&dataArg.length>0){ if(chartInfo.unit &&dataArg.length>0){
maxValue=dataArg[0].data[0][1]; maxValue=dataArg[0].data[0][1];
minValue=dataArg[0].data[0][1]; minValue=dataArg[0].data[0][1];
for(let j = 0; j < dataArg.length ; j++){ for(let j = 0; j < dataArg.length ; j++){
for (let i = 0; i < dataArg[j].data.length - 1; i++) { for (let i = 0; i < dataArg[j].data.length - 1; i++) {
maxValue = (maxValue < dataArg[j].data[i+1][1] ? dataArg[j].data[i+1][1] : maxValue); maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue);
minValue = (minValue > dataArg[j].data[i+1][1] ? dataArg[j].data[i+1][1] : minValue); minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue);
} }
} }
} }
console.log(maxValue,'increase(mysql_global_status_bytes_sent[1h])');
let chartUnit=chartInfo.unit?chartInfo.unit:2; let chartUnit=chartInfo.unit?chartInfo.unit:2;
let unit=chartDataFormat.getUnit(chartUnit); let unit=chartDataFormat.getUnit(chartUnit);
maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii);
@@ -752,8 +753,8 @@
axisLine:{ axisLine:{
show:false show:false
}, },
minInterval: chartDataFormat.Interval(maxValue,copies,unit.type), minInterval: chartDataFormat.Interval(maxValue,copies,unit.type,'min'),
maxInterval: chartDataFormat.Interval(maxValue,copies,unit.type), maxInterval: chartDataFormat.Interval(maxValue,copies,unit.type,'max'),
axisTick: { axisTick: {
show: false, show: false,
}, },