From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.ts | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 8ef6a88..32699da 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,24 +69,14 @@
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 => {
@@ -115,14 +105,20 @@
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,
smooth: true,
- type: 'line',
- name: legendName
+ type: params.reportType,
+ name: legendName,
+ itemStyle: {
+ normal: {
+ barBorderRadius: [10, 10, 10, 10]
+ }
+ }
});
}
const myChart = echarts.init(document.getElementById('mydiv' + index));
@@ -135,8 +131,15 @@
}
});
$('#content').attr({style: "display: inline;"});
+ this.spinning = false;
+ const title = this.title.replace(' ', '-').split('-');
+ this.title = '';
+ for (let i = 0; i < title.length; i++) {
+ if (i < 3) {
+ this.title = this.title + title[i] + this.timeArr[i];
+ }
+ }
}
- this.spinning = false;
});
});
}
--
Gitblit v1.8.0