From 7d4045bb727ac6e86939569258cbce1bd2adda58 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 29 Mar 2018 14:04:46 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/reports/demo/demo.component.ts | 4 ++--
src/app/routes/reports/excel/excel.component.html | 2 +-
src/app/routes/reports/excel/excel.component.ts | 4 ++--
src/app/routes/reports/demo/demo.component.html | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index a88f325..a11c51f 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -8,7 +8,7 @@
<label> ��� ���</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
+ <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
<nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit"></nz-option>
</nz-select>
</div>
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 37cf5ed..431b3a2 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -131,8 +131,8 @@
}
}
if (validate && this.timeType && query.reportType) {
- if (query.sensorKey && query.sensorKey.length > 0) {
- query.sensors = JSON.stringify(query.sensorKey);
+ if (query.sensorKeys && query.sensorKeys.length > 0) {
+ query.sensors = JSON.stringify(query.sensorKeys);
}
query.items = JSON.stringify(queryItems);
query.type = this.timeType.value;
diff --git a/src/app/routes/reports/excel/excel.component.html b/src/app/routes/reports/excel/excel.component.html
index 6ba33e1..027c865 100644
--- a/src/app/routes/reports/excel/excel.component.html
+++ b/src/app/routes/reports/excel/excel.component.html
@@ -8,7 +8,7 @@
<label> ������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'���������'" [nzMode]="'multiple'">
+ <nz-select [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'���������'" [nzMode]="'multiple'">
<nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit" ></nz-option>
</nz-select>
</div>
diff --git a/src/app/routes/reports/excel/excel.component.ts b/src/app/routes/reports/excel/excel.component.ts
index a6fce42..1d499ce 100644
--- a/src/app/routes/reports/excel/excel.component.ts
+++ b/src/app/routes/reports/excel/excel.component.ts
@@ -80,8 +80,8 @@
if (query.timeb) {
query.timeb = this.dateSrv.date_format(query.timeb, this.timeType.format);
}
- if (query.sensorKey && query.sensorKey.length > 0) {
- query.sensors = JSON.stringify(query.sensorKey);
+ if (query.sensorKeys && query.sensorKeys.length > 0) {
+ query.sensors = JSON.stringify(query.sensorKeys);
}
query.type = this.timeType.value;
let url = environment.SERVER_BASH_URL + 'report/excel?';
--
Gitblit v1.8.0