From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/business/entity/data.ts | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index f56e676..38e3557 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,5 +1,6 @@
+import { LineChartCriteria } from './data';
import { Column } from '@business/entity/grid';
-import { AlarmStyle } from '@business/enum/types.enum';
+import { AlarmStyle, TimeUnits, AreaRange } from '@business/enum/types.enum';
export interface AreaNames {
@@ -132,4 +133,19 @@
mode: string;
organizationId: number;
username: string;
+}
+export interface TimePeriod{
+ startTime:number;//������������
+ endTime:number;//������������
+}
+export interface DataCondition{
+ timeUnits:TimeUnits;//������
+ actualTime:number;//������������
+ areaRange:AreaRange;//������������
+ areaRangeId:number;//���������������ID
+}
+export interface LineChartCriteria{
+ sensorKey:String;
+ timePeriod:TimePeriod;
+ dataConditions:DataCondition[];
}
\ No newline at end of file
--
Gitblit v1.8.0