From 5e502e366836b3577884bca89372541b42124cd3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 02 May 2018 16:03:59 +0800
Subject: [PATCH] 工作台 数据填充，监控点 改监控站点
---
src/app/business/entity/data.ts | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index b963553..8d91a87 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,4 +1,3 @@
-import { LineChartCriteria } from './data';
import { Column } from '@business/entity/grid';
import { AlarmStyle, TimeUnits, AreaRange } from '@business/enum/types.enum';
@@ -47,7 +46,7 @@
version?: Column|any;
}
- // ���������
+ // ������������
export interface MonitorPoint {
address?: any|Column;
areaCode?: any|Column;
@@ -108,6 +107,7 @@
export interface AlarmMode {
enable: boolean|any[];
+ interval: number;
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
@@ -134,18 +134,28 @@
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;
+}
+
+export interface PairData {
+ category: string;
+ value: number;
}
--
Gitblit v1.8.0