From 43e7ed40c26afa535aba24b1c9ddc1b87b607d8d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 09:26:26 +0800
Subject: [PATCH] 报表查看

---
 src/app/business/entity/data.ts |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 93354c3..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 {
@@ -83,6 +84,7 @@
 export interface AlarmSensorLevel {
   enable: boolean|any [];
   increment: number []|any[];
+  degressEnable:boolean|any [];
   degression: number []|any [];
 }
 export interface Device {
@@ -124,4 +126,26 @@
   address:string;
   describe:string;
   name:string;
+}
+
+export interface UserContext {
+  authorities: any[];
+  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