screen_demo2.git

			@@ -2,35 +2,46 @@
			<h1>数据查询</h1>
			</div>
			<nz-card [nzBordered]="false">
			<form nz-form (ngSubmit)="loadGrid()" [nzLayout]="'inline'">
			<form nz-form [nzLayout]="'inline'">
			<div nz-row [nzGutter]="24">
			<div nz-col [nzSpan]="8" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label>
			<label>监测项目</label>
			<div [ngStyle]="{'width': '100px'}" nz-form-label>
			<label>
			项目({{ sensorsSelect+'/'+sensorsLength }})
			</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-popover [nzTitle]="'请选择'" [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
			<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorNames" [nzReadonly]="true" [nzPlaceHolder]="'请选择监控类型'">
			<nz-popover [nzPlacement]="'bottomLeft'" [(nzVisible)]="sensorSelectVisible" [nzTrigger]="'click'">
			<nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" style="cursor:pointer;"
			name="sensorNames" [nzReadonly]="true"
			[nzPlaceHolder]="'请选择监控类型'">
			<ng-template #suffix>
			<i class="anticon anticon-plus ant-input-search-icon"></i>
			<i class="anticon anticon-down ng-star-inserted ant-cascader-picker-arrow" style="right: 1px;"></i>
			</ng-template>
			</nz-input>
			<ng-template #nzTemplate>
			<div [ngStyle]="{'width': '240px', 'height': '240px', 'overflow-y' :'auto'}">
			<nz-tree [nzNodes]="sensorOptions"
			(nzActivate)="onTreeClickSelect($event)"
			(nzDeactivate)="onTreeClickSelect($event)"
			[nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
			<div style="position: relative; width: 240px; height: 240px;" (mouseover) = "onTreeMouseOver($event)" (mouseout) = "onTreeMouseOut($event)">
			<div style="position: absolute; left: -16px; width: 272px; height: 256px; overflow-y :auto; top: -8px;">
			<nz-tree [nzNodes]="sensorOptions" (nzActivate)="onTreeClickSelect($event)"
			(nzDeactivate)="onTreeClickSelect($event)" [nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
			</div>
			</div>
			</ng-template>
			</nz-popover>
			<!-- <div style="top:0; right: -62px; position:absolute; font-size: 16px; color: #696969;">
			<span>(</span>
			<span style="display: inline-block; width: 50px; text-align: center;">
			{{ sensorsSelect+'/'+sensorsLength }}
			</span>
			<span>)</span>
			</div> -->
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="8" class="mb-md">
			<div nz-col [nzSpan]="9" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label>
			<div [ngStyle]="{'width': '128px'}" nz-form-label>
			<label>时间类型</label>
			</div>
			<div nz-form-control class="flex-1">
			@@ -41,9 +52,9 @@
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="8" class="mb-md">
			<div nz-col [nzSpan]="7" class="mb-md">
			<div nz-form-item class="d-flex">
			<div nz-form-label>
			<div nz-form-label>
			<label>选择日期</label>
			</div>
			<div *ngIf="timeUnit.value!='MONTH'; else elseBlock" nz-form-control class="flex-1">
			@@ -65,7 +76,7 @@
			<div [ngStyle]="{'display':isCollapse ? 'none' : 'block' }" nz-row [nzGutter]="24">
			<div nz-col [nzSpan]="8" class="mb-md">
			<div nz-form-item class="d-flex">
			<div [ngStyle]="{'width': '70px'}" nz-form-label>
			<div [ngStyle]="{'width': '100px'}" nz-form-label>
			<label>省市区</label>
			</div>
			<div nz-form-control class="flex-1">
			@@ -75,27 +86,36 @@
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="8" class="mb-md">
			<div nz-col [nzSpan]="9" class="mb-md">
			<div nz-form-item class="d-flex">
			<div [ngStyle]="{'width': '70px'}" nz-form-label>
			<label>监控点</label>
			<div [ngStyle]="{'width': '128px'}" nz-form-label>
			<label>
			<nz-dropdown>
			<button nz-button nz-dropdown ><span>{{dimensionItem.label}}</span> <i class="anticon anticon-down"></i></button>
			<ul nz-menu>
			<li *ngFor="let option of otherDimensions;let i = index;" nz-menu-item>
			<a (click)="selectDimension(option)">{{option.label}}</a>
			</li>
			</ul>
			</nz-dropdown>
			</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-select name="monitorPoint" style="width: 100%;" [(ngModel)]="monitorPoint" nzAllowClear [nzPlaceHolder]="'选择监控点(输入名称搜索)'"
			nzShowSearch (nzSearchChange)="monitorPointsChange($event)" [nzNotFoundContent]="'无法找到'">
			<nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option.name" [nzValue]="option">
			<nz-select name="deviceDimension" style="width: 100%;" [(ngModel)]="deviceDimension" nzAllowClear [nzPlaceHolder]="'选择 '+ dimensionItem.label +'(输入名称搜索)'"
			nzShowSearch (nzSearchChange)="dimensionsChange($event)" [nzNotFoundContent]="'无法找到'">
			<nz-option *ngFor="let option of dimensionOptions" [nzLabel]="option.name" [nzValue]="option">
			</nz-option>
			</nz-select>
			</div>
			</div>
			</div>
			<div nz-col [nzSpan]="8" class="mb-md">
			<div nz-col [nzSpan]="7" class="mb-md">
			<div nz-form-item class="d-flex">
			<div [ngStyle]="{'width': '70px'}" nz-form-label>
			<label>设备</label>
			</div>
			<div nz-form-control class="flex-1">
			<nz-select name="device" style="width: 100%;" [(ngModel)]="device" nzAllowClear [nzPlaceHolder]="'先选择监控点(输入名称搜索)'" nzShowSearch
			<nz-select name="device" style="width: 100%;" [(ngModel)]="device" nzAllowClear [nzPlaceHolder]="'先选择 '+ dimensionItem.label +'(输入名称搜索设备)'" nzShowSearch
			(nzSearchChange)="devicesChange($event)" [nzNotFoundContent]="'无法找到'">
			<nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option">
			</nz-option>
			@@ -106,7 +126,7 @@
			</div>
			<div nz-row>
			<div nz-col [nzSpan]="24" class="text-right">
			<button nz-button [nzType]="'primary'">
			<button nz-button [nzType]="'primary'" (click)="loadGrid()">
			<i class="anticon anticon-search"></i>
			<span>查询</span>
			</button>