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

Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js
#	nezha-fronted/src/components/page/asset/asset.vue
This commit is contained in:
zhangyu
2022-03-30 18:35:11 +08:00
parent 5b6e01c79b 5db4f9cb09
commit 5a912e7aae
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ function percent02 (value, index) {
if (!numberWithEConvent(scientificNotationValue)) {
return `${scientificNotationValue} %`
}
value = parseFloat((Number(value) * 100))
value = parseFloat((Number(value) * 100).toFixed(2))
return `${value} %`
}
function localFormat (value, index) {
@@ -728,7 +728,7 @@ export default {
pow++
value = value * 10
}
return Math.ceil(value + 1) / Math.pow(10, pow)
return Math.floor(value + 1) / Math.pow(10, pow)
}
if (type === 'Time') {
return value