Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-05-28 f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e

 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,