From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/business/entity/data.ts | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 38e3557..c2458bb 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';
@@ -34,7 +33,7 @@
provinceCode?: Column|any;
rank?: Column|any;
telephone?: Column|any;
- areaNames?: AreaNames|any ;
+ areaNames?: AreaNames;
}
// ������������
@@ -77,14 +76,14 @@
export interface AlarmConfigValue {
alarmMode: AlarmMode;
- alarmLevels:{[key: string]:AlarmSensorLevel};
+ alarmLevels: {[key: string]: AlarmSensorLevel};
}
export interface AlarmSensorLevel {
enable: boolean|any [];
increment: number []|any[];
- degressEnable:boolean|any [];
+ degressEnable: boolean|any [];
degression: number []|any [];
}
export interface Device {
@@ -117,15 +116,15 @@
deviceId?: number|any[];
id?: number|any[];
updateTime?: number|any[];
- value?:{[s:string] : number}|any[];
+ value?: {[s: string]: number}|any[];
}
-export interface CoorPicker{
- longitude:number;// ������
- latitude:number;// ������
- address:string;
- describe:string;
- name:string;
+export interface CoorPicker {
+ longitude: number; // ������
+ latitude: number; // ������
+ address: string;
+ describe: string;
+ name: string;
}
export interface UserContext {
@@ -134,18 +133,28 @@
organizationId: number;
username: string;
}
-export interface TimePeriod{
- startTime:number;//������������
- endTime:number;//������������
+
+
+export interface LineChartCriteria {
+ dataConditions?: DataCondition[];
+ sensorKey?: string;
+ timePeriod?: TimePeriod;
}
-export interface DataCondition{
- timeUnits:TimeUnits;//������
- actualTime:number;//������������
- areaRange:AreaRange;//������������
- areaRangeId:number;//���������������ID
+
+export interface TimePeriod {
+ endTime?: Date;
+ startTime?: Date;
+ timeUnits?: TimeUnits;
}
-export interface LineChartCriteria{
- sensorKey:String;
- timePeriod:TimePeriod;
- dataConditions:DataCondition[];
-}
\ No newline at end of file
+
+export interface DataCondition {
+ actualTime?: number;
+ areaRange?: AreaRange;
+ areaRangeId?: number;
+ timeUnits?: TimeUnits;
+}
+
+export interface PairData {
+ category: string;
+ value: number;
+}
--
Gitblit v1.8.0