From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

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

diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index 3fc5a08..7dda4d5 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/src/app/business/enum/types.enum.ts
@@ -1,3 +1,16 @@
 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= 'PROVINCE', CITY= 'CITY', AREA= 'AREA', MONITORPOINT= 'MONITORPOINT', DEVICE= 'DEVICE'
+}
+export enum ResultCode {
+    SUCCESS= 1, FAIL= 0
+}

--
Gitblit v1.8.0