From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +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.component.ts | 4 ++--
1 files changed, 2 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 a724ad9..9b1a017 100644
--- a/src/app/routes/devices/monitor-point/monitor-point.component.ts
+++ b/src/app/routes/devices/monitor-point/monitor-point.component.ts
@@ -52,7 +52,7 @@
width: '300px'
}
};
- this.grid.title = '���������';
+ this.grid.title = '������������';
this.grid.setColumns(this.monitorPoint);
this.grid.pageSize = 10;
}
@@ -186,7 +186,7 @@
adress = areaNames.provinceName + areaNames.cityName + areaNames.areaName + record.address;
}
this.coorPickerService.data.address = adress;
- this.coorPickerService.data['describe'] = '���������������';
+ this.coorPickerService.data['describe'] = '������������������';
this.modalHelper.static(CoordinatesPickerComponent).subscribe(
(staticComp) => {
const data: MonitorPoint = {
--
Gitblit v1.8.0