From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/reports/alarm/alarm.component.ts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/reports/alarm/alarm.component.ts b/src/app/routes/reports/alarm/alarm.component.ts
index 606ce17..d337dd7 100644
--- a/src/app/routes/reports/alarm/alarm.component.ts
+++ b/src/app/routes/reports/alarm/alarm.component.ts
@@ -43,7 +43,7 @@
];
public dimensionOptions = [
{value: 'sensor', label: '������'},
- {value: 'monitorPoint', label: '���������'}
+ {value: 'monitorPoint', label: '������������'}
];
isDisable = false;
private treeClickStream: Subject<any> = new Subject<any>();
--
Gitblit v1.8.0