From 062df3fdc8a7309c23e3ec8add778a5982977647 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 04 May 2018 14:19:01 +0800
Subject: [PATCH] 三级警报数据
---
src/app/routes/reports/demo/demo.component.html | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.html b/src/app/routes/reports/demo/demo.component.html
index b9b6d8e..c0089fb 100644
--- a/src/app/routes/reports/demo/demo.component.html
+++ b/src/app/routes/reports/demo/demo.component.html
@@ -4,24 +4,32 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
+ <!-- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
<nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey + '-' + option.name + '-' + option.unit"></nz-option>
- </nz-select>
- <!-- <input nz-input />
- <div>
- <ul id="sensorTree" class="ztree"></ul>
- </div> -->
+ </nz-select> -->
+ <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
+ <nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'��������� ������'">
+ <ng-template #suffix>
+ <i class="anticon anticon-down 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>
+ </ng-template>
+ </nz-popover>
</div>
</div>
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label nz-form-item-required>��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'���������'">
@@ -32,7 +40,7 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
@@ -55,12 +63,11 @@
<div nz-row [nzGutter]="24" *ngFor="let item of items;let i = index">
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>���������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-cascader [class.class123]="true" (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'������ ���/���/���'" (nzSelectionChange)="setAreasData($event,i)"
- [nzAllowClear]="false" [nzChangeOnSelect]="true" [ngModel]="item._areas" name="areasData{{item.id}}">
+ <nz-cascader (nzLoad)="areaLazyLoad($event,i)" [nzPlaceHolder]="'��������� ���/���/���'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event,i)">
</nz-cascader>
</div>
</div>
@@ -68,12 +75,12 @@
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label>���������</label>
+ <div nz-form-label class="label-width-70">
+ <label>������������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" nzAllowClear [nzPlaceHolder]="'������ ���������'" [nzSize]="'large'"
- [nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch>
+ <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"
+ [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>
@@ -81,8 +88,8 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
- <label> ��� ���</label>
+ <div nz-form-label class="label-width-70">
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select [(ngModel)]="item.device" name="mac{{item.id}}" [nzSize]="'large'" [nzPlaceHolder]="'��������� ������'" [nzNotFoundContent]="'������������'" nzShowSearch nzAllowClear>
@@ -93,7 +100,7 @@
</div>
<div nz-col [nzSpan]="5" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label nz-form-item-required>������</label>
</div>
<div nz-form-control class="flex-1">
--
Gitblit v1.8.0