From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/business/enum/types.enum.ts | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/app/business/enum/types.enum.ts b/src/app/business/enum/types.enum.ts
index 7dda4d5..ad1f20a 100644
--- a/src/app/business/enum/types.enum.ts
+++ b/src/app/business/enum/types.enum.ts
@@ -9,8 +9,17 @@
YEAR= 'YEAR', MONTH= 'MONTH', DAY= 'DAY', HOUR= 'HOUR', MINUTE= 'MINUTE'
}
export enum AreaRange {
- PROVINCE= 'PROVINCE', CITY= 'CITY', AREA= 'AREA', MONITORPOINT= 'MONITORPOINT', DEVICE= 'DEVICE'
+ PROVINCE= 'PROVINCE',
+ CITY= 'CITY',
+ AREA= 'AREA',
+ MONITORPOINT= 'MONITORPOINT',
+ DEVICE= 'DEVICE'
}
export enum ResultCode {
SUCCESS= 1, FAIL= 0
}
+export enum DeviceDimension{
+ MONITORPOINT= 'MONITORPOINT', // ��������������� ������������������������������������
+ PROFESSION='PROFESSION',
+ NONE='NONE'
+}
\ No newline at end of file
--
Gitblit v1.8.0