From 5e502e366836b3577884bca89372541b42124cd3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 02 May 2018 16:03:59 +0800
Subject: [PATCH] 工作台 数据填充，监控点 改监控站点
---
src/app/routes/reports/query/query.component.html | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.html b/src/app/routes/reports/query/query.component.html
index b9c3f1b..069b653 100644
--- a/src/app/routes/reports/query/query.component.html
+++ b/src/app/routes/reports/query/query.component.html
@@ -10,15 +10,20 @@
<label>������������</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" [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>
@@ -75,10 +80,10 @@
<div nz-col [nzSpan]="8" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '70px'}" nz-form-label>
- <label>���������</label>
+ <label>������������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select name="monitorPoint" style="width: 100%;" [(ngModel)]="monitorPoint" nzAllowClear [nzPlaceHolder]="'������ ���������(������������������)'"
+ <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-option>
@@ -92,7 +97,7 @@
<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]="'��������� ������������(������������������)'" nzShowSearch
(nzSearchChange)="devicesChange($event)" [nzNotFoundContent]="'������������'">
<nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option">
</nz-option>
--
Gitblit v1.8.0