From 6f1ab8e489e791734a2c63550b63ad1cb74b4f57 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:19:29 +0800
Subject: [PATCH] 设备页面bug 修复
---
src/app/business/entity/data.ts | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 24f7cb5..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;
@@ -107,6 +113,7 @@
export interface AlarmMode {
enable: boolean|any[];
+ interval: number;
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
@@ -137,7 +144,7 @@
export interface LineChartCriteria {
dataConditions?: DataCondition[];
- sensorKey?: string;
+ sensorKeys?: string[];
timePeriod?: TimePeriod;
}
@@ -152,4 +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