From 8924ddb98072a5621d5cf01ed26e2cb424d71908 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 10:38:49 +0800
Subject: [PATCH] 监控点 增加镇村选项
---
src/app/routes/devices/monitor-point/monitor-point.component.ts | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 9d69db9..37af735 100644
--- a/src/app/routes/devices/monitor-point/monitor-point.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point.component.ts
@@ -40,7 +40,12 @@
format: (value: any, col: Column, row: any) => {
value = value == null ? '' : value;
if (row['areaNames'] != null) {
- return row['areaNames']['provinceName'] + row['areaNames']['cityName'] + row['areaNames']['areaName'] + value;
+ return row['areaNames']['provinceName']
+ + (!!row['areaNames']['cityName'] ? row['areaNames']['cityName'] : '')
+ + (!!row['areaNames']['areaName'] ? row['areaNames']['areaName'] : '')
+ + (!!row['areaNames']['townName'] ? row['areaNames']['townName'] : '')
+ + (!!row['areaNames']['villageName'] ? row['areaNames']['villageName'] : '')
+ + value;
} else {
return value;
}
--
Gitblit v1.8.0