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

NEZ-3417 fix: 修复 图表 数值很小小于1024时 单位精度不正确

Browse Source
This commit is contained in:
zhangyu
2024-02-28 10:28:41 +08:00
parent 738640417b
commit 1100c8c13c
2 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
nezha-fronted/src/components/chart/chartDataFormat.js
View File

@@ -58,35 +58,21 @@ function localFormat (value, index, type = 1, dot = 2) {
return result return result
} }
function bits (value, index, type = 1, dot = 0) { function bits (value, index, type = 1, dot = 0) {
const num = value / 8
if (value < 8) {
return value + 'b'
}
if (num < 1024) {
return num + 'B'
}
if (type == 1) { if (type == 1) {
return asciiCompute(num, 1024, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 0) return asciiCompute(value, 1024, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 0, true)
} else if (type == -1) { } else if (type == -1) {
return asciiCompute(num, 1024, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], dot) return asciiCompute(value, 1024, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], dot, true)
} else { } else {
return asciiCompute(num, 1024, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 2) return asciiCompute(value, 1024, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 2, true)
} }
} }
function bitsSI (value, index, type = 1, dot = 0) { function bitsSI (value, index, type = 1, dot = 0) {
const num = value / 8
if (value < 8) {
return value + 'b'
}
if (num < 1000) {
return num + 'B'
}
if (type == 1) { if (type == 1) {
return asciiCompute(num, 1000, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 0) return asciiCompute(value, 1000, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 0, true)
} else if (type == -1) { } else if (type == -1) {
return asciiCompute(num, 1000, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], dot) return asciiCompute(value, 1000, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], dot, true)
} else { } else {
return asciiCompute(num, 1000, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 2) return asciiCompute(value, 1000, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 2, true)
} }
} }
function bytes (value, index, type = 1, dot) { function bytes (value, index, type = 1, dot) {
@@ -207,19 +193,12 @@ function packetsSec (value, index, type = 1, dot) {
} }
} }
function bitsSec (value, index, type = 1, dot) { function bitsSec (value, index, type = 1, dot) {
const num = value / 8
if (value < 8) {
return value + 'b'
}
if (num < 1024) {
return num + 'B'
}
if (type == 1) { if (type == 1) {
return asciiCompute(value, 1024, ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 1) return asciiCompute(value, 1024, ['bps', 'Bbps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 1, true)
} else if (type == -1) { } else if (type == -1) {
return asciiCompute(value, 1024, ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], dot) return asciiCompute(value, 1024, ['bps', 'Bbps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], dot, true)
} else { } else {
return asciiCompute(value, 1024, ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 2) return asciiCompute(value, 1024, ['bps', 'Bbps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 2, true)
} }
} }
function bytesSec (value, index, type = 1, dot) { function bytesSec (value, index, type = 1, dot) {
@@ -322,19 +301,12 @@ function petabitsSec (value, index, type = 1, dot) {
} }
} }
function bitsSecSI (value, index, type = 1, dot) { function bitsSecSI (value, index, type = 1, dot) {
const num = value / 8
if (value < 8) {
return value + 'b'
}
if (num < 1000) {
return num + 'B'
}
if (type == 1) { if (type == 1) {
return asciiCompute(value, 1000, ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 1) return asciiCompute(value, 1000, ['bps', 'Bbps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 1, true)
} else if (type == -1) { } else if (type == -1) {
return asciiCompute(value, 1000, ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], dot) return asciiCompute(value, 1000, ['bps', 'Bbps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], dot, true)
} else { } else {
return asciiCompute(value, 1000, ['bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 2) return asciiCompute(value, 1000, ['bps', 'Bbps', 'Kbps', 'Mbps', 'Gbps', 'Tbps', 'Pbps', 'Epps', 'Zpps', 'Ypps'], 2, true)
} }
} }
function bytesSecSI (value, index, type = 1, dot) { function bytesSecSI (value, index, type = 1, dot) {
@@ -545,18 +517,27 @@ function numberWithEConvent (num) {
* units：单位列表 * units：单位列表
* dot：保留的小数位， * dot：保留的小数位，
* */ * */
function asciiCompute (num, ascii, units, dot = 2) { function asciiCompute (num, ascii, units, dot = 2, isBits = false) {
if (isNaN(num) || num === null) { if (isNaN(num) || num === null) {
return num return num
} }
const scientificNotationValue = formatScientificNotation(num, dot) const scientificNotationValue = formatScientificNotation(num, dot)
if (!numberWithEConvent(scientificNotationValue)) { if (!numberWithEConvent(scientificNotationValue)) {
return scientificNotationValue return scientificNotationValue + ' ' + units[0]
} }
if (!num && num !== 0 && num !== '0') { if (!num && num !== 0 && num !== '0') {
return '' return ''
} }
num = Number(num) num = Number(num)
if (isBits) {
num = num / 8
if (num < 8) {
return num.toFixed(dot) + ' ' + units[0]
}
if (num < ascii) {
return num.toFixed(dot) + ' ' + units[1]
}
}
const SIGN = num > 0 ? 1 : -1 const SIGN = num > 0 ? 1 : -1
num = Math.abs(num) num = Math.abs(num)
let carry = 0 let carry = 0

2
nezha-fronted/static/config.json
View File

@@ -1 +1 @@
{"baseUrl":"http://192.168.44.22/", "version": "23.06"} {"baseUrl":"http://192.168.44.36/", "version": "23.06"}