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

2022-03-30 15:17:08 +08:00
parent 9104c2502c fc0a575ea5
commit 42ae7d5dfe
24 changed files with 175 additions and 97 deletions
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -397,6 +397,9 @@ function asciiCompute2 (num, ascii, units, dot = 2, unitIndex = 0) {
 * unit:设置的单位
 * */
 function timeCompute (value, unit, dot = 0) {
+  if (isNaN(value)) {
+    return `0 ${unit}`
+  }
  if (unit == 'year') {
    return `${value.toFixed(dot)} ${unit}`
  }