From 71371f81071a72eecd7d7a02ae3825943aae50d1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Apr 2018 08:57:38 +0800
Subject: [PATCH] 报表展示 饼图功能
---
src/app/business/entity/data.ts | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index f56e676..6cc45a1 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -1,5 +1,5 @@
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 {
@@ -33,7 +33,7 @@
provinceCode?: Column|any;
rank?: Column|any;
telephone?: Column|any;
- areaNames?: AreaNames|any ;
+ areaNames?: AreaNames;
}
// ������������
@@ -76,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 {
@@ -107,6 +107,7 @@
export interface AlarmMode {
enable: boolean|any[];
+ interval: number;
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
@@ -116,15 +117,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 {
@@ -132,4 +133,29 @@
mode: string;
organizationId: number;
username: string;
-}
\ No newline at end of file
+}
+
+
+export interface LineChartCriteria {
+ 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