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/enum/types.enum.ts | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index b1a5157..7dda4d5 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/src/app/business/enum/types.enum.ts
@@ -1,8 +1,16 @@
export enum Types {
Date, Json
}
-
export enum AlarmStyle {
- //���������������������������������
- weixin='weixin',email='email',sms='sms',voice='voice'
+ // ���������������������������������
+ weixin= 'weixin', email= 'email', sms= 'sms', voice= 'voice'
+}
+export enum TimeUnits {
+ YEAR= 'YEAR', MONTH= 'MONTH', DAY= 'DAY', HOUR= 'HOUR', MINUTE= 'MINUTE'
+}
+export enum AreaRange {
+ PROVINCE= 'PROVINCE', CITY= 'CITY', AREA= 'AREA', MONITORPOINT= 'MONITORPOINT', DEVICE= 'DEVICE'
+}
+export enum ResultCode {
+ SUCCESS= 1, FAIL= 0
}
--
Gitblit v1.8.0