From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/reports/demo/demo.component.html | 72 ++++++++++++------------------------
1 files changed, 24 insertions(+), 48 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index 2062384..ed8b01c 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -5,10 +5,10 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
<div nz-form-label>
- <label nz-form-item-required>��� ���</label>
+ <label> ��� ���</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'���������'" (ngModelChange)="sensorChange($event)" nzAllowClear>
+ <nz-select [(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>
</div>
@@ -20,23 +20,31 @@
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.type" name="isDelete" [nzSize]="'large'" [nzPlaceHolder]="'���������'" (ngModelChange)="typeChange($event)">
+ <nz-select [(ngModel)]="query.type" name="type" [nzSize]="'large'" [nzPlaceHolder]="'���������'" (ngModelChange)="typeChange($event)">
<nz-option *ngFor="let option of typeOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
</nz-select>
</div>
</div>
</div>
+ <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length!=5">
+ <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>
+ <span>������������������</span>
+ </button>
+ </div>
+
</div>
- <div nz-row [nzGutter]="24">
+ <div nz-row [nzGutter]="24" *ngFor="let item of items;let i = index">
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
<div nz-form-label>
- <label >���������</label>
+ <label nz-form-item-required>���������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.monitorPoint" name="monitorPoint" nzAllowClear [nzPlaceHolder]="'���������'" [nzFilter]="false" [nzSize]="'large'"
- (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event)" nzShowSearch>
+ <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" nzAllowClear [nzPlaceHolder]="'���������'" [nzFilter]="false" [nzSize]="'large'"
+ (nzSearchChange)="searchChange($event,i)" [nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch>
<nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option>
</nz-select>
</div>
@@ -48,7 +56,7 @@
<label> ������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.mac" name="mac" [nzSize]="'large'" nzAllowClear [nzPlaceHolder]="'���������'" (ngModelChange)="deviceChange($event)">
+ <nz-select [(ngModel)]="item.mac" name="mac{{item.id}}" [nzSize]="'large'" nzAllowClear [nzPlaceHolder]="'���������'" (ngModelChange)="deviceChange($event,i)">
<nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
</nz-select>
</div>
@@ -57,53 +65,21 @@
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
<div nz-form-label>
- <label >������</label>
+ <label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-datepicker style="width: 100%;" [(ngModel)]="query.time" name="time" [nzPlaceHolder]="'���������'" [nzFormat]="time.format" [nzMode]="time.mode" [nzSize]="'large'" nzShowTime></nz-datepicker>
+ <nz-datepicker style="width: 100%;" value="" [(ngModel)]="item.time" name="time{{item.id}}" id="{{item.time}}" [nzPlaceHolder]="'���������'" [nzFormat]="time.format" [nzMode]="time.mode" [nzSize]="'large'" nzShowTime></nz-datepicker>
</div>
</div>
+ </div>
+ <div nz-col [nzSpan]="6" class="mb-md" *ngIf="items.length!=1">
+ <button nz-button type="button" [nzType]="'danger'" [nzSize]="'large'" (click)="items.splice(i, 1)" nzGhost>
+ <i class="anticon anticon-minus-circle-o dynamic-delete-button"></i>
+ <span>������������������</span>
+ </button>
</div>
</div>
- <div nz-row [nzGutter]="24">
- <div nz-col [nzSpan]="6" class="mb-md">
- <div nz-form-item class="d-flex">
- <div nz-form-label>
- <label >���������</label>
- </div>
- <div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.monitorPointb" name="monitorPointb" nzAllowClear [nzPlaceHolder]="'���������'" [nzFilter]="false" [nzSize]="'large'"
- (nzSearchChange)="searchChangeb($event)" [nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointbChange($event)" nzShowSearch>
- <nz-option *ngFor="let option of monitorPointbOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option>
- </nz-select>
- </div>
- </div>
- </div>
- <div nz-col [nzSpan]="6" class="mb-md">
- <div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ������</label>
- </div>
- <div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="query.macb" name="macb" [nzSize]="'large'" nzAllowClear [nzPlaceHolder]="'���������'" (ngModelChange)="devicebChange($event)">
- <nz-option *ngFor="let option of devicebOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
-
- </nz-select>
- </div>
- </div>
- </div>
- <div nz-col [nzSpan]="6" class="mb-md">
- <div nz-form-item class="d-flex">
- <div nz-form-label>
- <label >������</label>
- </div>
- <div nz-form-control class="flex-1">
- <nz-datepicker style="width: 100%;" [(ngModel)]="query.timeb" name="timeb" [nzPlaceHolder]="'���������'" [nzFormat]="time.format" [nzMode]="time.mode" [nzSize]="'large'" nzShowTime></nz-datepicker>
- </div>
- </div>
- </div>
- </div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6" class="mb-md">
<button nz-button type="submit" [nzType]="'primary'" [nzSize]="'large'">������</button>
--
Gitblit v1.8.0