From 51350ae38d5490eeccb538b60444fe9099cf4a61 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 17:06:59 +0800
Subject: [PATCH] 查询数据bug修改
---
src/app/routes/analysis/query/query.component.html | 202 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 154 insertions(+), 48 deletions(-)
diff --git a/src/app/routes/analysis/query/query.component.html b/src/app/routes/analysis/query/query.component.html
index 97a90da..7f0441c 100644
--- a/src/app/routes/analysis/query/query.component.html
+++ b/src/app/routes/analysis/query/query.component.html
@@ -1,51 +1,157 @@
-<nz-card [nzBordered]="true">
- <div nz-row>
- <div nz-col [nzXs]="20" [nzSm]="8" class="header-info">
- <p class="text-grey-dark">������������������</p>
- <nz-dropdown>
- <a class="ant-dropdown-link" nz-dropdown>
- <p class="display-2">{{ lineChartSensorName }}<i class="anticon anticon-down"></i></p>
- </a>
- <ul style="height:280px;overflow:auto;" nz-menu>
- <li style="width:200px;cursor:pointer;" *ngFor="let sensor of sensorList"
- (click) = "lineChartCriteria.sensorKey=sensor.sensorKey" nz-menu-item>
- <p>
- {{sensor.name}}
- </p>
- </li>
- </ul>
- </nz-dropdown>
- <em></em>
+<div class="content__title">
+ <h1>������������</h1>
+</div>
+<nz-card [nzBordered]="false">
+ <form nz-form (ngSubmit)="loadGrid()" [nzLayout]="'inline'">
+ <div nz-row [nzGutter]="24">
+ <div nz-col [nzSpan]="8" 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-popover [nzTitle]="'���������'" [nzPlacement]="'bottomLeft'" [nzTrigger]="'hover'">
+ <nz-input [nzType]="'input'" nz-popover [ngModel]="sensorNames" name="sensorNames" [nzReadonly]="true" [nzPlaceHolder]="'���������������������'">
+ <ng-template #suffix>
+ <i class="anticon anticon-plus ant-input-search-icon"></i>
+ </ng-template>
+ </nz-input>
+ <ng-template #nzTemplate>
+ <div [ngStyle]="{'width': '200px', 'height': '300px', 'overflow-y' :'auto'}">
+ <nz-tree [nzNodes]="sensorOptions" [nzCheckable]="true" (nzCheck)="onSensorSelect($event)"></nz-tree>
+ </div>
+ </ng-template>
+ </nz-popover>
+ </div>
+ </div>
+ </div>
+ <div nz-col [nzSpan]="8" 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 name="timeUnit" [(ngModel)]="timeUnit" [nzPlaceHolder]="'������ ������������'"
+ (ngModelChange)="setTimeUnit($event)" [nzNotFoundContent]="'������������'">
+ <nz-option *ngFor="let option of timeUnitOptions" [nzLabel]="option.label" [nzValue]="option">
+ </nz-option>
+ </nz-select>
+ </div>
+ </div>
+ </div>
+ <div nz-col [nzSpan]="8" class="mb-md">
+ <div nz-form-item class="d-flex">
+ <div nz-form-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" [nzMode]="_timeType.mode"
+ [nzFormat]="_timeType.dateFormat" [nzPlaceHolder]="'������������'">
+ </nz-datepicker>
+ </div>
+ <ng-template #elseBlock>
+ <div nz-form-control class="flex-1">
+ <nz-select name="actualYear" [(ngModel)]="actualYear" [nzPlaceHolder]="'������ ������������'"
+ (ngModelChange)="setTimeUnit($event)" [nzNotFoundContent]="'������������'">
+ <nz-option *ngFor="let option of actualYearOptions" [nzLabel]="option" [nzValue]="option">
+ </nz-option>
+ </nz-select>
+ </div>
+ </ng-template>
+ </div>
+ </div>
</div>
- <div nz-col [nzXs]="20" [nzSm]="8" class="header-info">
- <p class="text-grey-dark">���������������������</p>
- <nz-dropdown>
- <a class="ant-dropdown-link" nz-dropdown>
- <p class="display-2">{{ timePeriodUnitName }}<i class="anticon anticon-down"></i></p>
- </a>
- <ul nz-menu>
- <li style="width:60px;cursor:pointer;" *ngFor="let item of timeUnits"
- (click)="timePeriodUnitValue = item.value" nz-menu-item>
- <p>
- {{item.label}}
- </p>
- </li>
- </ul>
- </nz-dropdown>
- <em></em>
+ <div *ngIf="!isCollapse" nz-row [nzGutter]="24">
+ <div nz-col [nzSpan]="8" 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-cascader [class.class123]="true" (nzChange)="setAreaCodes($event)"
+ (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'������ ���/���/���'"
+ [nzAllowClear]="false" [nzChangeOnSelect]="true" [(ngModel)]="_areas" name="_areas">
+ </nz-cascader>
+ </div>
+ </div>
+ </div>
+ <div nz-col [nzSpan]="8" 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="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>
+ </nz-select>
+ </div>
+ </div>
+ </div>
+ <div nz-col [nzSpan]="8" 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]="'��������� ���������(������������������)'"
+ 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-col [nzSm]="8" class="header-info">
- <p class="text-grey-dark">���������������������</p>
- <nz-datepicker style="width: 42%;"
- [(ngModel)]="lineChartCriteria.timePeriod.startTime"
- [nzDisabledDate]="_disabledStartDate"
- nzShowTime="{{ !!timeType.timePickerOption?timeType.timePickerOption:false }}" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat" [nzPlaceHolder]="'Start date'"></nz-datepicker>
- <span>-</span>
- <nz-datepicker style="width: 42%;"
- [nzDisabledDate]="_disabledEndDate"
- [(ngModel)]="lineChartCriteria.timePeriod.endTime"
- nzShowTime="{{ !!timeType.timePickerOption?timeType.timePickerOption:false }}" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat" [nzPlaceHolder]="'End date'"></nz-datepicker>
- </div>
- <input type="button" value="text" width="100px;" (click)="_isSameDay"/>
+ <div nz-row>
+ <div nz-col [nzSpan]="24" class="text-right">
+ <button nz-button [nzType]="'primary'">
+ <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>
+</nz-card>
+<div nz-row [nzGutter]="16">
+ <div nz-col [nzMd]="24">
+ <nz-card>
+ <nz-table #nzTable [nzScroll]="{ x:5000,y:400 }" [nzDataSource]="grid.data" [nzIsPagination]="false" [nzLoading]="grid.loading">
+ <ng-template #nzFixedHeader>
+ <thead nz-thead>
+ <tr>
+ <th nz-th [nzWidth]="'80px'" >
+ <span>������������</span>
+ </th>
+ <th nz-th [nzWidth]="'80px'" *ngFor="let col of grid.columns" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
+ <span>{{ col.text }}</span>
+ </th>
+ </tr>
+ </thead>
+ </ng-template>
+ <tbody nz-tbody>
+ <tr nz-tbody-tr *ngFor="let row of nzTable.data,index as i">
+ <td nz-td>
+ <span>{{ gridSensorNames[i] }}</span>
+ </td>
+ <td nz-td *ngFor="let col of grid.columns,index as n" [ngStyle]="{'width':col.width,'text-align':col['align'] === undefined?'left':col.align}">
+ <span [ngSwitch]="col.type">
+ <!-- ������������������������������������ -->
+ <span title="{{ row[n]|tyepHandle:col:row }}" style="width:100%; display:block; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" *ngSwitchDefault> {{ row[n]|tyepHandle:col:row }} </span>
+ <!-- ������������������������������������ -->
+ </span>
+ </td>
+ </tr>
+ </tbody>
+ </nz-table>
+ </nz-card>
</div>
-</nz-card>
\ No newline at end of file
+</div>
--
Gitblit v1.8.0