From ba6f868ccc79328594f42d85ea34ca254e5d51d8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 24 Mar 2018 23:05:43 +0800
Subject: [PATCH] grid 冻结 功能 延迟bug修复
---
src/app/routes/report/report.component.ts | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 8ef6a88..4f85b42 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -9,14 +9,10 @@
@Component({
selector: 'app-report',
templateUrl: './report.component.html',
- // styles: ['./report.component.less'],
styleUrls: ['./report.component.css']
})
export class ReportComponent implements OnInit {
- [x: string]: any;
-
- spinning: boolean = true;
constructor(
public injector: Injector,
public http: HttpClient,
@@ -27,6 +23,10 @@
this.sensorArr.push(index);
}
}
+
+ [x: string]: any;
+
+ public spinning: boolean = true;
public echartOption = {
backgroundColor: '',
@@ -69,39 +69,28 @@
name: ''
},
- series: [
- // {
- // smooth: true,
- // type: 'line',
- // data: [],
- // name: '',
- // itemStyle: {
- // normal: {
- // barBorderRadius: [10, 10, 10, 10]
- // }
- // }
- // }
- ]
+ series: []
};
sensorArr: any = [];
items: any = [];
timeType: any = {};
+ title: string;
+ timeArr = ['���', '���', '���', '���', '���'];
ngOnInit() {
this.activeRoute.queryParams.subscribe(params => {
const items = this.items = JSON.parse(params.items);
- const timeType = this.timeType = JSON.parse(params.timeType);
+ const timeType = this.timeType = JSON.parse(params.timeTypes);
this.http.get(environment.SERVER_BASH_URL + 'report/compare', {params: params}).subscribe((res: any) => {
if (res.code === 0) {
this.msgSrv.error(res.message);
} else {
const option = this.echartOption;
- const datas = res.data.datas;
- const times = res.data.times;
const sensors = res.data.sensors;
- option.xAxis.data = times;
- option.xAxis.name = timeType.xAxisName;
+ const timeArr = this.timeArr;
+ option.xAxis.data = res.data.times;
+ option.xAxis.name = timeArr[timeArr.indexOf(timeType.label) + 1];
for (let index = 0; index < sensors.length; index++) {
const sensorKey = sensors[index];
const split = sensorKey.split('-');
@@ -115,14 +104,19 @@
option.backgroundColor = 'rgba(23,133,23,0.06)';
}
for (let i = 0; i < items.length; i++) {
+ this.title = items[i].formatTime;
const legendName = items[i].formatTime + timeType.label + (items[i].mac ? items[i].deviceName : items[i].monitorPointName);
option.legend.data[i] = legendName;
- const seriesData = datas[i]['data' + i][0][sensorKey];
option.series.push({
- data: seriesData,
+ name: legendName,
+ data: res.data.datas[i]['data' + i][0][sensorKey],
+ type: params.reportType,
smooth: true,
- type: 'line',
- name: legendName
+ itemStyle: {
+ normal: {
+ barBorderRadius: [10, 10, 10, 10]
+ }
+ }
});
}
const myChart = echarts.init(document.getElementById('mydiv' + index));
@@ -135,8 +129,13 @@
}
});
$('#content').attr({style: "display: inline;"});
+ this.spinning = false;
+ const title: any[] = this.title.replace(' ', '-').split('-');
+ this.title = '';
+ for (let i = 0; i < title.length; i++) {
+ this.title += title[i] + timeArr[i];
+ }
}
- this.spinning = false;
});
});
}
--
Gitblit v1.8.0