From 23c86948e859aa59a74f43d7072f94a717db86ce Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 8 Apr 2024 11:56:58 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3435=20=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=A7=91=E5=AD=A6=E8=AE=A1=E6=95=B0=E6=B3=95=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84Y=E8=BD=B4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/chart/chart/uplot/chartTimeSeries.vue | 6 +++++- nezha-fronted/src/components/chart/chartDataFormat.js | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue index a823c8a9b..e8cc824b4 100644 --- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue @@ -188,6 +188,7 @@ export default { const self = this const leftUnit = this.chartInfo.unit const leftUnitCompute = chartDataFormat.getUnit(leftUnit) + console.log(leftUnitCompute) const rightUnit = this.$lodash.get(this.chartInfo, 'param.rightYAxis.unit', 2) const rightUnitCompute = chartDataFormat.getUnit(rightUnit) const incrs = leftUnitCompute.ascii == 1024 ? this.incrs : undefined @@ -291,7 +292,10 @@ export default { }, { scale: 'left', - values: (u, vals, space) => vals.map(v => leftUnitCompute.compute(v, null, -1, decimals) + ''), + values: (u, vals, space) => vals.map(v => { + console.log(v) + return leftUnitCompute.compute(v, null, -1, decimals) + '' + }), incrs: incrs, gap: 5, stroke: self.color[self.theme].label, diff --git a/nezha-fronted/src/components/chart/chartDataFormat.js b/nezha-fronted/src/components/chart/chartDataFormat.js index f082f3800..fab36e43a 100644 --- a/nezha-fronted/src/components/chart/chartDataFormat.js +++ b/nezha-fronted/src/components/chart/chartDataFormat.js @@ -542,7 +542,10 @@ function asciiCompute (num, ascii, units, dot = 2, isBits = false) { num = Math.abs(num) let carry = 0 if (num > 1) { - const log = Math.log(num) / Math.log(ascii) + let log = Math.log(num) / Math.log(ascii) + if (!numberWithEConvent(log)) { + log = 0 + } carry = parseInt(log) num = num / Math.pow(ascii, carry) } @@ -554,6 +557,10 @@ function asciiCompute (num, ascii, units, dot = 2, isBits = false) { if (Number.isInteger(num)) { return num * SIGN + ' ' + units[carry] } else { + if (!numberWithEConvent(num)) { + console.log(units, carry) + return num * SIGN + ' ' + units[carry] + } return num.toFixed(dot) * SIGN + ' ' + units[carry] } }