From 50dd4eecb5ed476bfe91a796efc59d35c0890487 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 14 Mar 2018 13:41:25 +0800
Subject: [PATCH] login bug 修复
---
src/app/business/entity/data.ts | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index 595ad88..c2458bb 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 {
@@ -11,7 +11,7 @@
export interface Sensor {
description?: any|Column;
id?: any|Column;
- key?: any|Column;
+ sensorKey?: any|Column;
lower?: any|Column;
name?: any|Column;
unit?: any|Column;
@@ -33,7 +33,7 @@
provinceCode?: Column|any;
rank?: Column|any;
telephone?: Column|any;
- areaNames?: AreaNames|any ;
+ areaNames?: AreaNames;
}
// ������������
@@ -76,14 +76,33 @@
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 [];
degression: number []|any [];
+}
+export interface Device {
+ address?: any|Column;
+ createTime?: any|Column;
+ deviceVersion?: any|Column;
+ deviceVersionId?: any|Column;
+ id?: any|Column;
+ installTime?: any|Column;
+ isDelete?: any|Column;
+ latitude?: any|Column;
+ longitude?: any|Column;
+ mac?: any|Column;
+ monitorPoint?: any|Column;
+ monitorPointId?: any|Column;
+ name?: any|Column;
+ operateUser?: any|Column;
+ operateUserId?: any|Column;
+ state?: any|Column;
}
export interface AlarmMode {
@@ -91,4 +110,51 @@
level1: AlarmStyle[]|any[];
level2: AlarmStyle[]|any[];
level3: AlarmStyle[]|any[];
-}
\ No newline at end of file
+}
+export interface DeviceAdjustValue {
+ createTime?: number|any[];
+ deviceId?: number|any[];
+ id?: number|any[];
+ updateTime?: number|any[];
+ value?: {[s: string]: number}|any[];
+}
+
+export interface CoorPicker {
+ longitude: number; // ������
+ latitude: number; // ������
+ address: string;
+ describe: string;
+ name: string;
+}
+
+export interface UserContext {
+ authorities: any[];
+ mode: string;
+ organizationId: number;
+ username: string;
+}
+
+
+export interface LineChartCriteria {
+ 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