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 | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index b963553..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';
@@ -134,18 +133,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[];
+ sensorKey?: 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