From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/business/enum/types.enum.ts | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index 55d7143..7dda4d5 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/src/app/business/enum/types.enum.ts
@@ -2,12 +2,15 @@
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 TimeUnits {
+ YEAR= 'YEAR', MONTH= 'MONTH', DAY= 'DAY', HOUR= 'HOUR', MINUTE= 'MINUTE'
}
export enum AreaRange {
- PROVINCE='PROVINCE',CITY='CITY',AREA='AREA',MONITORPOINT='MONITORPOINT',DEVICE='DEVICE'
-}
\ No newline at end of file
+ PROVINCE= 'PROVINCE', CITY= 'CITY', AREA= 'AREA', MONITORPOINT= 'MONITORPOINT', DEVICE= 'DEVICE'
+}
+export enum ResultCode {
+ SUCCESS= 1, FAIL= 0
+}
--
Gitblit v1.8.0