From d6836305986df618fc6be6a46305b75b6b1dddf3 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 21 Mar 2018 10:13:54 +0800
Subject: [PATCH] 报表优化
---
src/app/routes/reports/demo/demo.component.ts | 8 ++++++++
src/app/routes/reports/demo/demo.component.html | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index f988a34..257c492 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -8,8 +8,8 @@
<label> ��� ���</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'���������'" nzAllowClear>
- <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey" ></nz-option>
+ <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
+ <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option"></nz-option>
</nz-select>
</div>
</div>
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 755551b..54f635f 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -154,6 +154,14 @@
}
}
if (validate && query.type && query.reportType) {
+ query.sensors = null;
+ if (query.sensorKey && query.sensorKey.length > 0) {
+ const sensors = [];
+ query.sensorKey.forEach(sensor => {
+ sensors.push(sensor.sensorKey + '-' + sensor.name + '-' + sensor.unit);
+ });
+ query.sensors = JSON.stringify(sensors);
+ }
query.timeType = JSON.stringify(this.timeType);
query.items = JSON.stringify(this.items);
this.router.navigate(['report'], {queryParams: query});
--
Gitblit v1.8.0