From 6da582b887cf7ceadf1617417d7c15b239a2e008 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:08 +0800
Subject: [PATCH] 设备mac地址唯一性检验，查询数据行业添加
---
src/app/business/entity/data.ts | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 06e1770..81fa665 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,5 +1,5 @@
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 {
@@ -46,7 +46,7 @@
version?: Column|any;
}
- // ���������
+ // ������������
export interface MonitorPoint {
address?: any|Column;
areaCode?: any|Column;
@@ -99,6 +99,7 @@
mac?: any|Column;
monitorPoint?: any|Column;
monitorPointId?: any|Column;
+ professionId?: any|Column;
name?: any|Column;
operateUser?: any|Column;
operateUserId?: any|Column;
@@ -107,6 +108,7 @@
export interface AlarmMode {
enable: boolean|any[];
+ interval: number;
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
@@ -152,6 +154,8 @@
areaRange?: AreaRange;
areaRangeId?: number;
timeUnits?: TimeUnits;
+ deviceDimension?: DeviceDimension;
+ dimensionValue?: any;
}
export interface PairData {
--
Gitblit v1.8.0