From d6836305986df618fc6be6a46305b75b6b1dddf3 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 21 Mar 2018 10:13:54 +0800
Subject: [PATCH] 报表优化

---
 src/app/routes/reports/demo/demo.component.ts |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 755551b..54f635f 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -154,6 +154,14 @@
       }
     }
     if (validate && query.type && query.reportType) {
+      query.sensors = null;
+      if (query.sensorKey && query.sensorKey.length > 0) {
+        const sensors = [];
+        query.sensorKey.forEach(sensor => {
+          sensors.push(sensor.sensorKey + '-' + sensor.name + '-' + sensor.unit);
+        });
+        query.sensors = JSON.stringify(sensors);
+      }
       query.timeType = JSON.stringify(this.timeType);
       query.items = JSON.stringify(this.items);
       this.router.navigate(['report'], {queryParams: query});

--
Gitblit v1.8.0