From 4056d69076e49d28ee54b169b42c6430c1c2e261 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 12 Jul 2018 16:50:31 +0800
Subject: [PATCH] updates
---
src/app/routes/reports/query/query.component.html | 96 ++++++++++++------------------------------------
1 files changed, 24 insertions(+), 72 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.html b/src/app/routes/reports/query/query.component.html
index cae4d8e..ea66909 100644
--- a/src/app/routes/reports/query/query.component.html
+++ b/src/app/routes/reports/query/query.component.html
@@ -4,12 +4,10 @@
<nz-card [nzBordered]="false">
<form nz-form [nzLayout]="'inline'">
<div nz-row [nzGutter]="24">
- <div nz-col [nzSpan]="8" class="mb-md">
+ <div nz-col [nzSpan]="6" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '100px'}" nz-form-label>
- <label>
- ������({{ sensorsSelect+'/'+sensorsLength }})
- </label>
+ <label>������������</label>
</div>
<div nz-form-control class="flex-1">
<nz-popover [nzPlacement]="'bottomLeft'" [(nzVisible)]="sensorSelectVisible" [nzTrigger]="'click'">
@@ -29,20 +27,13 @@
</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]="9" class="mb-md">
+ <div nz-col [nzSpan]="4" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '128px'}" nz-form-label>
- <label>������������</label>
+ <label>������</label>
</div>
<div nz-form-control class="flex-1">
<nz-select name="timeUnit" [(ngModel)]="timeUnit" [nzPlaceHolder]="'������ ������������'" (ngModelChange)="setTimeUnit($event)" [nzNotFoundContent]="'������������'">
@@ -54,8 +45,22 @@
</div>
<div nz-col [nzSpan]="7" class="mb-md">
<div nz-form-item class="d-flex">
+ <div [ngStyle]="{'width': '128px'}" nz-form-label>
+ <label>������������</label>
+ </div>
+ <div nz-form-control class="flex-1">
+ <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]="5" class="mb-md">
+ <div nz-form-item class="d-flex">
<div nz-form-label>
- <label>������������</label>
+ <label>������:</label>
</div>
<div *ngIf="timeUnit.value!='MONTH'; else elseBlock" nz-form-control class="flex-1">
<nz-datepicker [ngStyle]="{'width': '100%'}" name="actualTime" [(ngModel)]="actualTime" [nzAllowClear]="false" [nzShowTime]="_timeType.showTime"
@@ -72,68 +77,11 @@
</ng-template>
</div>
</div>
- </div>
- <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': '100px'}" nz-form-label>
- <label>���������</label>
- </div>
- <div nz-form-control class="flex-1">
- <nz-cascader [class.class123]="true" (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'������ ���/���/���'" (nzSelectionChange)="setAreasData($event)"
- [nzAllowClear]="false" [nzChangeOnSelect]="true" [ngModel]="_areas" name="areasData">
- </nz-cascader>
- </div>
- </div>
- </div>
- <div nz-col [nzSpan]="9" class="mb-md">
- <div nz-form-item class="d-flex">
- <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="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]="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]="'��������� '+ dimensionItem.label +'(������������������������)'" nzShowSearch
- (nzSearchChange)="devicesChange($event)" [nzNotFoundContent]="'������������'">
- <nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option">
- </nz-option>
- </nz-select>
- </div>
- </div>
- </div>
- </div>
- <div nz-row>
- <div nz-col [nzSpan]="24" class="text-right">
+ <div nz-col [nzSpan]="2" class="mb-md">
<button nz-button [nzType]="'primary'" (click)="loadGrid()">
<i class="anticon anticon-search"></i>
<span>������</span>
</button>
- <a class="pl-sm" (click)="toggleCollapse()">
- ������
- <i class="anticon" [class.anticon-down]="isCollapse" [class.anticon-up]="!isCollapse"></i>
- </a>
</div>
</div>
</form>
@@ -211,6 +159,8 @@
</tr>
</tbody>
</nz-table>
+
+ <!--
<div *ngIf="grid.data.length>0" [ngClass]="{'table-scroll':true,'table-scroll-box-shadow': sensorNameScrollLeft>2 }" style="position: absolute; top:0;">
<nz-table #nzTable [nzDataSource]="grid.data" [nzIsPagination]="false">
<thead nz-thead>
@@ -234,6 +184,8 @@
</tbody>
</nz-table>
</div>
+ -->
+
</div>
</div>
</nz-card>
--
Gitblit v1.8.0