screen_demo2.git

			@@ -12,7 +12,7 @@
			<nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit"></nz-option>
			</nz-select> -->
			<nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
			<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'请选择项目'">
			<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'请选择项目'" [nzSize]="'large'">
			<ng-template #suffix>
			<i class="anticon anticon-down ant-cascader-picker-arrow" style="right: 1px;"></i>
			</ng-template>
			@@ -29,7 +29,19 @@
			<div nz-col [nzSpan]="5" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label class="label-width-70">
			<label nz-form-item-required>类型</label>
			<label>维度</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-select [(ngModel)]="query.dimension" name="dimension" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" (ngModelChange)="dimensionChange($event)">
			<nz-option *ngFor="let option of dimensionOptions" [nzLabel]="option.label" [nzValue]="option.value" ></nz-option>
			</nz-select>
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="5" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label class="label-width-70">
			<label>类型</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
			@@ -41,7 +53,7 @@
			<div nz-col [nzSpan]="5" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label class="label-width-70">
			<label nz-form-item-required>图型</label>
			<label>图型</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-select [(ngModel)]="query.reportType" name="reportType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
			@@ -50,7 +62,7 @@
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="5" class="mb-md" *ngIf="items.length < 2">
			<div nz-col [nzSpan]="4" 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>
			@@ -67,13 +79,13 @@
			<label nz-form-item-required>省市区</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-cascader (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'请选择省/市/区'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
			<nz-cascader [nzSize]="'large'" (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'请选择省/市/区'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
			</nz-cascader>
			</div>
			</div>
			</div>

			<div nz-col [nzSpan]="5" class="mb-md">
			<div nz-col [nzSpan]="5" class="mb-md" [ngStyle]="{'display':monitorPointShow ? 'block' : 'none' }">
			<div nz-form-item class="d-flex">
			<div nz-form-label class="label-width-70">
			<label>监测站点</label>
			@@ -83,6 +95,18 @@
			[nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch nzAllowClear>
			<nz-option *ngFor="let option of item.monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option"> </nz-option>
			</nz-select>
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="5" class="mb-md" [ngStyle]="{'display':professionShow ? 'block' : 'none' }">
			<div nz-form-item class="d-flex">
			<div nz-form-label class="label-width-70">
			<label >行业</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-select [(ngModel)]="item.profession" name="profession{{item.id}}" [nzSize]="'large'" [nzPlaceHolder]="'请选择行业'" nzAllowClear (ngModelChange)="professionChange($event,i)" >
			<nz-option *ngFor="let option of professionOptions" [nzLabel]="option.name" [nzValue]="option" ></nz-option>
			</nz-select>
			</div>
			</div>
			</div>
			@@ -101,10 +125,10 @@
			<div nz-col [nzSpan]="5" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label class="label-width-70">
			<label nz-form-item-required>时间</label>
			<label>时间</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" [nzDisabledDate]="_disabledDate"
			<nz-datepicker style="width: 100%;" [(ngModel)]="item.time" name="time{{item.id}}" [nzFormat]="timeType.format" [nzDisabledDate]="_disabledDate" [nzAllowClear]="false"
			[nzMode]="timeType.value=='hour'\|\|timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false" [nzSize]="'large'"></nz-datepicker>
			</div>
			</div>