From 2656c7ab687d3e3b6f704b9d87ce20ff9c805bb0 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 07 Jun 2018 16:02:31 +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