diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index eab4d8bcc..04feba5a4 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -700,8 +700,7 @@ export default { case 10: return 5; } }, - Interval:function(value,copies,type){ - console.log(value,'Interval'); + Interval:function(value,copies,type,interValType){ if(value<1024&&type==='Data'){ let interVal=value/copies; return interVal @@ -721,7 +720,6 @@ export default { interVal=Math.ceil(interVal)*Math.pow(1024,pow); } interVal = interVal || 1; - console.log(interVal); return interVal } if(type==='DataRate' || type==='Misc'){ @@ -738,6 +736,9 @@ export default { console.log(interVal); return interVal } + if(interValType==='max'){ + return value + } return 1; // let interVal=value/copies; // interVal = interVal || 1; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 7bd1e2cd7..4a5cf8621 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -496,16 +496,17 @@ console.log(chartInfo, dataArg, chartSite,legend); let maxValue=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]; minValue=dataArg[0].data[0][1]; for(let j = 0; j < dataArg.length ; j++){ 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); - minValue = (minValue > dataArg[j].data[i+1][1] ? dataArg[j].data[i+1][1] : minValue); + 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); } } } + console.log(maxValue,'increase(mysql_global_status_bytes_sent[1h])'); let chartUnit=chartInfo.unit?chartInfo.unit:2; let unit=chartDataFormat.getUnit(chartUnit); maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii); @@ -752,8 +753,8 @@ axisLine:{ show:false }, - minInterval: chartDataFormat.Interval(maxValue,copies,unit.type), - maxInterval: chartDataFormat.Interval(maxValue,copies,unit.type), + minInterval: chartDataFormat.Interval(maxValue,copies,unit.type,'min'), + maxInterval: chartDataFormat.Interval(maxValue,copies,unit.type,'max'), axisTick: { show: false, },