From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/report/report.component.ts | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 85f429f..49d5917 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -123,27 +123,34 @@
for (let i = 0; i < items.length; i++) {
this.title = items[i].formatTime;
items[i].deviceCount = deviceCounts[i];
- if (!(items[i].monitorPointId)) {
+ /* if (!(items[i].monitorPointId)) {
items[i].monitorPointName = items[i].areaName;
- }
- const legendName = items[i].formatTime + label +
- (items[i].mac ? '������:' + items[i].deviceName : (items[i].monitorPointId ? '���������:' + items[i].monitorPointName : items[i].areaName));
+ } */
+ const showName = this.items[i].showName =
+ items[i].mac ? ('������:' + items[i].deviceName) :
+ ((items[i].monitorPointId ? '���������:' + items[i].monitorPointName : items[i].areaName) + (items[i].professionName ? items[i].professionName : ''));
+ const legendName = items[i].formatTime + label + showName;
items[i].legendName = option.legend.data[i] = legendName;
- option.series.push({
- name: legendName,
- data: res.data.datas[i][sensorKey],
- type: params.reportType,
- smooth: true,
- itemStyle: {
- normal: {
- barBorderRadius: [10, 10, 10, 10]
+ if (res.data.datas[i][sensorKey]) {
+ option.series.push({
+ name: legendName,
+ data: res.data.datas[i][sensorKey],
+ type: params.reportType,
+ smooth: true,
+ itemStyle: {
+ normal: {
+ barBorderRadius: [10, 10, 10, 10]
+ }
}
- }
- });
+ });
+ }
}
const myChart = echarts.init(document.getElementById('mydiv' + index));
myChart.setOption(option, true);
window.onresize = myChart.resize;
+ if (option.series.length < 1) {
+ $('#mydiv' + index).remove();
+ }
}
this.sensorArr.forEach(i => {
if (i >= sensors.length) {
@@ -151,6 +158,9 @@
}
});
this.spinning = false;
+ if (!this.title) {
+ this.title = items[0].formatTime;
+ }
const title: any[] = this.title.replace(' ', '-').split('-');
this.title = '';
for (let i = 0; i < title.length; i++) {
@@ -227,7 +237,7 @@
if (sensor.key === split[0]) {
this.resultArr.push({
sensorName: sensor.name,
- monitorPointName: this.items[split[1]].mac ? this.items[split[1]].deviceName : this.items[split[1]].monitorPointName,
+ monitorPointName: this.items[split[1]].showName,
result: res.data.sortList[i][key] + '%',
effect: sensor.effect,
measures: sensor.measures
--
Gitblit v1.8.0