From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/report/report.component.ts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 49d5917..85643f5 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -234,7 +234,7 @@
                 for (const key in res.data.sortList[i]) {
                   const split = key.split('-');
                   this.sensorKeys.forEach(sensor => {
-                    if (sensor.key === split[0]) {
+                    if (sensor.key === split[0] && res.data.sortList[i][key] != 0) {
                       this.resultArr.push({
                         sensorName: sensor.name,
                         monitorPointName: this.items[split[1]].showName,

--
Gitblit v1.8.0