From 899b4ddd9790728851834062c57892f600ee4355 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 19 Jun 2018 11:23:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/business/enum/types.enum.ts |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index 3fc5a08..c48b149 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/src/app/business/enum/types.enum.ts
@@ -1,3 +1,27 @@
 export enum Types {
     Date, Json
 }
+export enum AlarmStyle {
+    // ���������������������������������
+    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= 1, 
+    CITY= 2, 
+    AREA= 3, 
+    TOWN= 4, 
+    VILLAGE= 5, 
+    MONITORPOINT= 6, 
+    DEVICE= 7
+}
+export enum ResultCode {
+    SUCCESS= 1, FAIL= 0
+}
+export enum DeviceDimension {
+    MONITORPOINT= 'MONITORPOINT',  // ��������������� ������������������������������������
+    PROFESSION= 'PROFESSION',
+    NONE= 'NONE'
+}

--
Gitblit v1.8.0