From fa669c21647e53946af0e9b768dcab65742eb039 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 27 Mar 2018 10:31:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/reports/excel/excel.component.ts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/reports/excel/excel.component.ts b/src/app/routes/reports/excel/excel.component.ts
index 24d869b..519b820 100644
--- a/src/app/routes/reports/excel/excel.component.ts
+++ b/src/app/routes/reports/excel/excel.component.ts
@@ -104,7 +104,7 @@
reportQuery() {
const query = this.query;
- if (query.type && query.monitorPoint && query.time) {
+ if (query.type && query.monitorPointId && query.time) {
if (query.time) {
query.time = this.dateSrv.date_format(query.time, this.time.format);
}
--
Gitblit v1.8.0