screen_demo2.git

			@@ -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>