From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/reports/excel/excel.component.html | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/src/app/routes/reports/excel/excel.component.html b/src/app/routes/reports/excel/excel.component.html
index 4c8d63d..f0245c9 100644
--- a/src/app/routes/reports/excel/excel.component.html
+++ b/src/app/routes/reports/excel/excel.component.html
@@ -4,19 +4,20 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label>������</label>
</div>
<div nz-form-control class="flex-1">
- <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
- <nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorKeys" [nzReadonly]="true" [nzPlaceHolder]="'��������� ������'">
+ <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'">
+ <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 "></i>
+ <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>
+ <nz-tree [nzNodes]="sensorOptions" (nzActivate)="onTreeClickSelect($event)" (nzDeactivate)="onTreeClickSelect($event)" [nzCheckable]="true" (nzCheck)="onSensorSelect($event)">
+ </nz-tree>
</div>
</ng-template>
</nz-popover>
@@ -25,46 +26,7 @@
</div>
<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>
- </div>
- <div nz-form-control class="flex-1">
- <nz-cascader (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'��������� ���/���/���'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event)">
- </nz-cascader>
- </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.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ���������'" [nzSize]="'large'"
- [nzNotFoundContent]="'������������'" (ngModelChange)="monitorPointChange($event)" nzShowSearch nzAllowClear>
- <nz-option *ngFor="let option of monitorPointOptions" [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.mac" name="mac" [nzSize]="'large'" [nzPlaceHolder]="'��������� ������'" [nzNotFoundContent]="'������������'" nzShowSearch nzAllowClear>
- <nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
- </nz-select>
- </div>
- </div>
- </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>
+ <div nz-form-label class="label-width-70">
<label>������</label>
</div>
<div nz-form-control class="flex-1">
@@ -76,7 +38,7 @@
</div>
<div nz-col [nzSpan]="6" 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">
@@ -87,7 +49,7 @@
</div>
<div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label class="label-width-70">
<label >���������</label>
</div>
<div nz-form-control class="flex-1">
@@ -99,7 +61,56 @@
</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 class="label-width-70">
+ <label nz-form-item-required>���������</label>
+ </div>
+ <div nz-form-control class="flex-1">
+ <nz-cascader (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'��������� ���/���/���'" [nzAllowClear]="false" [nzChangeOnSelect]="true" (nzSelect)="regionChange($event)" [nzSize]="'large'">
+ </nz-cascader>
+ </div>
+ </div>
+ </div>
+ <div nz-col [nzSpan]="6" 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)]="query.professionId" name="profession" [nzSize]="'large'" [nzPlaceHolder]="'��������� ������'" nzAllowClear (ngModelChange)="getDevices()" >
+ <nz-option *ngFor="let option of professionOptions" [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 class="label-width-70">
+ <label>������������</label>
+ </div>
+ <div nz-form-control class="flex-1">
+ <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"
+ [nzNotFoundContent]="'������������'" (ngModelChange)="getDevices()" nzShowSearch nzAllowClear>
+ <nz-option *ngFor="let option of monitorPointOptions" [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 class="label-width-70">
+ <label>������</label>
+ </div>
+ <div nz-form-control class="flex-1">
+ <nz-select [(ngModel)]="query.mac" name="mac" [nzSize]="'large'" [nzPlaceHolder]="'��������� ������'" [nzNotFoundContent]="'������������'" nzShowSearch nzAllowClear>
+ <nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option.mac" ></nz-option>
+ </nz-select>
+ </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>
--
Gitblit v1.8.0