From 40e1fafb38d86b83e2321b9c173b3008494eaabe Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Thu, 4 Jun 2020 19:19:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/charts/chart-alert-list.vue | 2 +- nezha-fronted/src/components/page/alert/config.vue | 2 +- nezha-fronted/src/components/page/alert/list.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index 0f4950291..e1b7e5455 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -504,7 +504,7 @@ export default { }, formatThreshold:function(value,unit){ let unitMethod=chartDataFormat.getUnit(unit) - if(unitMethod&&unit.compute){ + if(unitMethod&&value){ return unitMethod.compute(value,null,2); }else{ return value diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 2dfa6387d..c4f44f8bc 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -355,7 +355,7 @@ }, formatThreshold:function(value,unit){ let unitMethod=chartDataFormat.getUnit(unit) - if(unitMethod&&unit.compute){ + if(unitMethod&&value){ return unitMethod.compute(value,null,2); }else{ return value diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index e87823841..8eed75afa 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -485,7 +485,7 @@ }, formatThreshold:function(value,unit){ let unitMethod=chartDataFormat.getUnit(unit) - if(unitMethod&&unit.compute){ + if(unitMethod&&value){ return unitMethod.compute(value,null,2); }else{ return value @@ -603,7 +603,7 @@ } }); }else{ - current=['',''] + current=[null,null] } this.$set(item, "current", current); });