From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/business/entity/data.ts | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 6cc45a1..2cd044c 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, Operator } 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,9 +159,29 @@
areaRange?: AreaRange;
areaRangeId?: number;
timeUnits?: TimeUnits;
+ deviceDimension?: DeviceDimension;
+ dimensionValue?: any;
}
export interface PairData {
category: string;
value: number;
}
+export interface OperatorRule {
+ operator: Operator;
+ value: number;
+}
+export interface SensorUnit {
+ id?: number|any;
+ originalUnitName?: string;
+ name?: string|any;
+ rules?: OperatorRule[]|any;
+ sensorId?: number|any;
+}
+export interface OrganizationSensorUnit {
+ id?: number|any;
+ sensorUnitId?: number|any;
+ sensorUnit?: SensorUnit|any;
+ sensor?: Sensor|any;
+ organizationId?: number|any;
+}
--
Gitblit v1.8.0