From 63ad97852c7db6df7f44185881a8c9c031a230c9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 20 Apr 2018 09:06:51 +0800
Subject: [PATCH] 报警数据 饼图功能
---
src/app/routes/reports/query/query.component.ts | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.ts b/src/app/routes/reports/query/query.component.ts
index 0a782de..109f749 100644
--- a/src/app/routes/reports/query/query.component.ts
+++ b/src/app/routes/reports/query/query.component.ts
@@ -131,7 +131,7 @@
if (!!text) {
example.or().andEqualTo({ name: 'monitorPointId', value: this.monitorPoint.id })
.andLike({name: 'text', value: text});
- }else {
+ } else {
example.or().andEqualTo({ name: 'monitorPointId', value: this.monitorPoint.id });
}
this.deviceService.getPageByExample(null, example).subscribe(
@@ -182,7 +182,7 @@
});
this._sensors = {};
// ������ ������ ������������
- }else {
+ } else {
// ������������
children.forEach(element => {
element['checked'] = true;
@@ -191,7 +191,7 @@
data['checked'] = true;
data['halfChecked'] = false;
}
- }else {
+ } else {
const parentData = event.node.parent.data;
data['checked'] = !data['checked'];
if (data['checked']) {
@@ -349,10 +349,10 @@
} else {
this._sensors = {};
}
- }else {
+ } else {
if (!!data.checked) {
this._sensors [data.id] = data.sensorKey;
- }else {
+ } else {
delete this._sensors[data.id];
}
}
@@ -693,9 +693,23 @@
public sensorTableFocus(index) {
this.sensorTableFocusIndex = index;
}
+
public sensorTableBlur(index) {
this.sensorTableFocusIndex = -1;
}
+ public sensorSelectVisible = false;
+ public treeMouseOverOccur = false;
+ public onTreeMouseOver(event) {
+ this.treeMouseOverOccur = true;
+ }
+ public onTreeMouseOut(event) {
+ this.treeMouseOverOccur = false;
+ setTimeout(() => {
+ if (!this.treeMouseOverOccur) {
+ this.sensorSelectVisible = false;
+ }
+ }, 900);
+ }
}
--
Gitblit v1.8.0