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.html | 12 ++++++------
1 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 2b7f51f..a11c51f 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]="'���������'">
- <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option"></nz-option>
+ <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>
</div>
@@ -38,7 +38,7 @@
</div>
</div>
</div>
- <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length < 4">
+ <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length < 2">
<button nz-button type="button" [nzType]="'primary'" [nzSize]="'large'" (click)="addItem()">
<!-- <i class="anticon anticon-plus"></i> -->
<i class="anticon anticon-plus-circle-o"></i>
@@ -80,8 +80,8 @@
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzPlaceHolder]="'���������'" [nzFormat]="timeType.format.toUpperCase()" [nzSize]="'large'"
- [nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false" [nzDisabledDate]="_disabledDate"></nz-datepicker>
+ <nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzPlaceHolder]="'���������'" [nzFormat]="timeType.format" [nzDisabledDate]="_disabledDate"
+ [nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false" [nzSize]="'large'"></nz-datepicker>
</div>
</div>
</div>
@@ -96,7 +96,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6" class="mb-md">
<button nz-button type="submit" [nzType]="'primary'" [nzSize]="'large'">������</button>
- <button nz-button type="reset" [nzSize]="'large'" class="mx-sm">������</button>
+ <!-- <button nz-button type="reset" [nzSize]="'large'" class="mx-sm" (click)="load()">������</button> -->
</div>
</div>
</form>
--
Gitblit v1.8.0