From 44e258acff991838ad7f10276556b596b6b0b25b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 16:03:34 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
index 2e75da8..8fafe6e 100644
--- a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts
@@ -32,7 +32,7 @@
let _areas = null;
if (areaNames != null) {
_areas = {
- label: Object.values(areaNames).join('/'),
+ label: Object.values(areaNames).filter(d=>d).join('/'),
value: data.areaCode
};
}
--
Gitblit v1.8.0