From 8ab24e9123c8b1cee08ba905aced0bd314c5bcd8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 27 Mar 2018 12:02:21 +0800
Subject: [PATCH] 去除监控项目 请选择标题
---
src/app/routes/reports/excel/excel.component.ts | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/reports/excel/excel.component.ts b/src/app/routes/reports/excel/excel.component.ts
index eb45bd4..519b820 100644
--- a/src/app/routes/reports/excel/excel.component.ts
+++ b/src/app/routes/reports/excel/excel.component.ts
@@ -21,9 +21,9 @@
mode: 'month'
};
- private sensorOptions = [];
- private monitorPointOptions = [];
- private deviceOptions = [];
+ public sensorOptions = [];
+ public monitorPointOptions = [];
+ public deviceOptions = [];
constructor(
public http: HttpClient,
@@ -84,7 +84,7 @@
}
- private typeOptions = [
+ public typeOptions = [
{value: 'year', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m'},
{value: 'month', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d'},
{value: 'day', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H'},
@@ -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);
}
@@ -122,7 +122,7 @@
url += encodeURI(a) + '=' + encodeURI(query[a]) + '&';
}
}
-
+
window.location.href = url + '_token=' + this.tokenService.get().token;
} else {
this.msgSrv.error('������������������');
--
Gitblit v1.8.0