From 008baf1470f2aaf6fe388a20b9a61069270a1471 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 17:19:11 +0800
Subject: [PATCH] 监控坐标编辑功能完善
---
src/app/business/entity/data.ts | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index b963553..81fa665 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,6 +1,5 @@
-import { LineChartCriteria } from './data';
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 {
@@ -47,7 +46,7 @@
version?: Column|any;
}
- // ���������
+ // ������������
export interface MonitorPoint {
address?: any|Column;
areaCode?: any|Column;
@@ -100,6 +99,7 @@
mac?: any|Column;
monitorPoint?: any|Column;
monitorPointId?: any|Column;
+ professionId?: any|Column;
name?: any|Column;
operateUser?: any|Column;
operateUserId?: any|Column;
@@ -108,6 +108,7 @@
export interface AlarmMode {
enable: boolean|any[];
+ interval: number;
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
@@ -134,18 +135,30 @@
organizationId: number;
username: string;
}
-export interface TimePeriod {
- startTime: Date; // ������������
- endTime: Date; // ������������
-}
-export interface DataCondition {
- timeUnits?: TimeUnits; // ������
- actualTime?: Date; // ������������
- areaRange?: AreaRange; // ������������
- areaRangeId?: number; // ���������������ID
-}
+
+
export interface LineChartCriteria {
- sensorKey: String;
- timePeriod: TimePeriod;
- dataConditions: DataCondition[];
+ dataConditions?: DataCondition[];
+ sensorKeys?: string[];
+ timePeriod?: TimePeriod;
+}
+
+export interface TimePeriod {
+ endTime?: Date;
+ startTime?: Date;
+ timeUnits?: TimeUnits;
+}
+
+export interface DataCondition {
+ actualTime?: number;
+ areaRange?: AreaRange;
+ areaRangeId?: number;
+ timeUnits?: TimeUnits;
+ deviceDimension?: DeviceDimension;
+ dimensionValue?: any;
+}
+
+export interface PairData {
+ category: string;
+ value: number;
}
--
Gitblit v1.8.0