From 27bd4a08bf807f4f6132bb524da33490b6d22f87 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 19 Jun 2018 11:45:11 +0800
Subject: [PATCH] 省市区兼容旧版本
---
src/app/business/entity/data.ts | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 6cc45a1..c44c39f 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,11 +1,13 @@
import { Column } from '@business/entity/grid';
-import { AlarmStyle, TimeUnits, AreaRange } from '@business/enum/types.enum';
+import { AlarmStyle, TimeUnits, AreaRange, DeviceDimension } from '@business/enum/types.enum';
export interface AreaNames {
provinceName?: string;
cityName?: string;
areaName?: string;
+ townName?: string;
+ villageName?: string;
}
// ���������
export interface Sensor {
@@ -46,7 +48,7 @@
version?: Column|any;
}
- // ���������
+ // ������������
export interface MonitorPoint {
address?: any|Column;
areaCode?: any|Column;
@@ -61,6 +63,9 @@
provinceCode?: any|Column;
areaNames?: AreaNames|any ;
organization?: Organization;
+ townCode?: any|Column;
+ villageCode?: any|Column;
+
}
// ������������
@@ -99,6 +104,7 @@
mac?: any|Column;
monitorPoint?: any|Column;
monitorPointId?: any|Column;
+ professionId?: any|Column;
name?: any|Column;
operateUser?: any|Column;
operateUserId?: any|Column;
@@ -153,6 +159,8 @@
areaRange?: AreaRange;
areaRangeId?: number;
timeUnits?: TimeUnits;
+ deviceDimension?: DeviceDimension;
+ dimensionValue?: any;
}
export interface PairData {
--
Gitblit v1.8.0