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/excel/excel.component.html |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/reports/excel/excel.component.html b/src/app/routes/reports/excel/excel.component.html
index 4c8d63d..dfd4b34 100644
--- a/src/app/routes/reports/excel/excel.component.html
+++ b/src/app/routes/reports/excel/excel.component.html
@@ -4,14 +4,14 @@
 		<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-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 "></i>
+                                    <i class="anticon anticon-down ant-cascader-picker-arrow" style="right: 1px;"></i>
                                 </ng-template>
                             </nz-input>
                             <ng-template #nzTemplate>
@@ -25,7 +25,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">
@@ -36,11 +36,11 @@
 			</div>
 			<div nz-col [nzSpan]="6" 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)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'��������� ���������'" [nzSize]="'large'"  
+						<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>
@@ -49,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">
@@ -64,7 +64,7 @@
 		<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 +76,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 +87,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">

--
Gitblit v1.8.0