From ba218bd17ed9b3bf1f330294714850a09ac71c17 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 13 Jul 2018 11:11:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/app/routes/reports/query/query.component.ts | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.ts b/src/app/routes/reports/query/query.component.ts
index 923a8c7..ffe5ddd 100644
--- a/src/app/routes/reports/query/query.component.ts
+++ b/src/app/routes/reports/query/query.component.ts
@@ -175,6 +175,25 @@
public onChartInit(e): void {
this.echartsIntance = e;
}
+ /**
+ * ������ sensor ������������������������
+ * @param sensorKeys
+ */
+ private mockSelectSensors(sensorKeys: string[]) {
+ // ������������ aqi 6���������
+ // Object.keys(this.aqiSort)
+ sensorKeys.forEach( key => {
+ const sensor = this.sensorOptions[0].children.find(
+ sen => sen.sensorKey === key
+ )
+ if (!!sensor) {
+ sensor['halfChecked'] = false;
+ sensor['checked'] = true;
+ const event = {node: {data: sensor}};
+ this.onSensorSelect(event);
+ }
+ });
+ }
constructor(
private http: _HttpClient,
private sensorsService: SensorsService,
@@ -232,6 +251,7 @@
this.sensorsService.getPagingList(null, null).subscribe(
(res: PageBean) => {
this.sensorOptions.push({id: -1, name: '������', isExpanded: true, children: res.data});
+ this.mockSelectSensors(Object.keys(this.aqiSort));
}
);
this.actualYearOptions = this.newArray(this.actualYear - 9, 10).map(item => Number(item)).reverse();
@@ -389,6 +409,7 @@
this.treeClickStream.next(event);
}
public onSensorSelect(event): void {
+ debugger;
const data = event.node.data;
if (data.id === -1 && data.halfChecked === false) {
if (!!data.checked) {
@@ -479,6 +500,7 @@
public loadGrid(): void {
// ������������
const sensors = Object.values(this._sensors);
+ debugger;
if ( sensors.length === 0 ) {
this.msg.error(' ������������ ������������');
return ;
@@ -625,7 +647,7 @@
// if ( this.chartSelectedIndex < this.grid.data.length ) {
// series = [{type: 'line', data: this.grid.data[this.chartSelectedIndex]}];
// }
- debugger;
+
this.initOpton({ xAxis : [{data : timeList}]});
this.chartLoading = true;
}
--
Gitblit v1.8.0