From 87b5c6927ee0f377d9fc0bcc0f9d1ea6b969ffe6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 06 Jun 2018 15:12:59 +0800
Subject: [PATCH] 解决超时弹窗反复弹出

---
 src/app/routes/devices/monitor-point/monitor-point.component.ts |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/devices/monitor-point/monitor-point.component.ts b/src/app/routes/devices/monitor-point/monitor-point.component.ts
index 9b1a017..9d69db9 100644
--- a/src/app/routes/devices/monitor-point/monitor-point.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point.component.ts
@@ -181,9 +181,15 @@
     Object.assign(this.coorPickerService.data, record);
     const _data = this.coorPickerService.data;
     const areaNames = record.areaNames;
-    let adress = null;
+    let adress = '';
     if (areaNames != null) {
-      adress = areaNames.provinceName + areaNames.cityName + areaNames.areaName + record.address;
+      adress += !!areaNames.provinceName?areaNames.provinceName:'';
+      adress += ' ';
+      adress += !!areaNames.cityName?areaNames.cityName:'';
+      adress += ' ';
+      adress += !!areaNames.areaName?areaNames.areaName:'';
+      adress += ' ';
+      adress += !!record.address?record.address:'';
     }
     this.coorPickerService.data.address = adress;
     this.coorPickerService.data['describe'] = '������������������';

--
Gitblit v1.8.0