From 39ea49edce74ae063ca0afd9b2966f861e256a3e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Apr 2018 13:18:36 +0800
Subject: [PATCH] ts fix,组织报警间隔时间设置
---
src/app/routes/reports/query/query.component.ts | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.ts b/src/app/routes/reports/query/query.component.ts
index b878e2c..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];
}
}
@@ -503,6 +503,7 @@
this.reloadChartTitle();
// ������������
this.grid.data = [];
+ console.log(lineChartCriteria);
this.http.post(environment.SERVER_BASH_URL + '/report/line-chart', lineChartCriteria).subscribe(
(res: ResultBean<{[key: string]: Array<Array<number>>}>) => {
if (res.code === 1) {
@@ -526,7 +527,7 @@
weight = !!value ? weight : weight + 1;
}
// ���������������������2���
- return !!value ? String(Math.round(value * 100) / 100) : '-';
+ return value != null ? String(Math.round(value * 100) / 100) : '-';
}
);
this.grid.data.push({sensor: sensor, data: sensorData, weight: weight});
@@ -692,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