From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/report/report.component.ts | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 25e5f9c..8b4f516 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -93,15 +93,15 @@
} else {
const option = this.echartOption;
const datas = res.data.datas;
- const times = res.data.times
- const sensors = res.data.sensors
+ const times = res.data.times;
+ const sensors = res.data.sensors;
option.xAxis.data = times;
option.xAxis.name = query.xAxisName;
for (let index = 0; index < sensors.length; index++) {
- let sensorKey = sensors[index];
- let split = sensorKey.split('-');
+ const sensorKey = sensors[index];
+ const split = sensorKey.split('-');
option.title.text = split[1] + query.label + '������������';
- option.yAxis.name = split[2] && split[2] != 'null' ? split[2] : '';
+ option.yAxis.name = split[2] && split[2] !== 'null' ? split[2] : '';
option.series = [];
option.legend.data = [];
--
Gitblit v1.8.0