From 43afaa6ad53ca4368fbc6426500f3f71f6f8b765 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 12 Mar 2018 09:02:31 +0800
Subject: [PATCH] 报表部分功能和token刷新
---
src/app/routes/analysis/query/query.component.html | 163 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 93 insertions(+), 70 deletions(-)
diff --git a/src/app/routes/analysis/query/query.component.html b/src/app/routes/analysis/query/query.component.html
index 8d782a2..dc05932 100644
--- a/src/app/routes/analysis/query/query.component.html
+++ b/src/app/routes/analysis/query/query.component.html
@@ -39,12 +39,15 @@
</div>
<div *ngIf="_timePeriodUnitValue!='YEAR'; else elseBlock" 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"
+ <nz-datepicker style="width: 42%;" [ngModel]="lineChartCriteria.timePeriod.startTime"
+ (ngModelChange) ="_timeChange($event,'start')"
+ [nzDisabledDate]="_disabledStartDate"
+ [nzShowTime]="_startShowTime" [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"
+ <nz-datepicker style="width: 42%;" [nzDisabledDate]="_disabledEndDate" [ngModel]="lineChartCriteria.timePeriod.endTime"
+ (ngModelChange) ="_timeChange($event,'end')"
+ [nzShowTime]="_endShowTime" [nzMode]="timeType.mode" [nzFormat]="timeType.dateFormat"
[nzPlaceHolder]="'End date'"></nz-datepicker>
</div>
<ng-template #elseBlock>
@@ -57,77 +60,97 @@
</ng-template>
</div>
</nz-card>
+<form nz-form [nzLayout]="'vertical'">
<nz-card [nzBordered]="true" title="������������">
- <form>
- <div nz-row [nzGutter]="16">
- <div nz-col nzMd="6" nzSm="12" nzXs="24">
- <div nz-form-item nz-row>
- <div nz-form-label nz-col><label>���������</label></div>
- <div nz-form-control nz-col nzHasFeedback>
- <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 nz-row [nzGutter]="16">
+ <div nz-col nzMd="6" nzSm="12" nzXs="24">
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col>
+ <label>���������</label>
</div>
- <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
- <div nz-form-item nz-row>
- <div nz-form-label nz-col><label>���������</label></div>
- <div nz-form-control nz-col nzHasFeedback>
- <nz-select
- name="_monitorPoint"
- style="width: 100%;" (click)="monitorPointChange(null)"
- [ngModel]="_monitorPoint"
- nzAllowClear
- (ngModelChange)="setMonitorPoint($event)"
- [nzPlaceHolder]="'������ ���������(������������������)'"
- nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
- <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option.id">
- </nz-option>
- </nz-select>
- </div>
-
- </div>
+ <div nz-form-control nz-col >
+ <nz-cascader [class.class123]="true" (nzChange)="setAreaCodes($event)" (nzLoad)="areaLazyLoad($event)" [nzPlaceHolder]="'������ ���/���/���'"
+ [nzAllowClear]="false" [nzChangeOnSelect]="true" [(ngModel)]="_areas" name="_areas">
+ </nz-cascader>
</div>
- <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
- <div nz-form-item nz-row>
- <div nz-form-label nz-col><label>������</label></div>
- <div nz-form-control nz-col nzHasFeedback>
- 11111111111111111
- </div>
-
- </div>
- </div>
+ </div>
</div>
- <div style="margin-top: 20px;" nz-row [nzGutter]="16">
- <div nz-col nzMd="6" nzSm="12" nzXs="24">
- <div nz-form-item nz-row>
- <div nz-form-label nz-col><label>������������</label></div>
- <div nz-form-control nz-col nzHasFeedback>
- 222222222
- </div>
-
- </div>
+ <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col>
+ <label>���������</label>
</div>
- <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
- <div nz-form-item nz-row>
- <div nz-form-label nz-col><label>������������</label></div>
- <div nz-form-control nz-col nzHasFeedback>
- 2222222222
- </div>
- </div>
+ <div nz-form-control nz-col>
+ <nz-select name="_monitorPoint" style="width: 100%;" [ngModel]="_monitorPoint" (ngModelChange)="setMonitorPoint($event)"
+ nzAllowClear [nzPlaceHolder]="'������ ���������(������������������)'" nzShowSearch (nzSearchChange)="monitorPointChange($event)"
+ [nzNotFoundContent]="'������������'">
+ <nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option">
+ </nz-option>
+ </nz-select>
</div>
- <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
- <div nz-form-item nz-row>
- <div nz-form-label nz-col><label>������</label></div>
- <div nz-form-control nz-col nzHasFeedback>
- 2222222222
- </div>
- </div>
- </div>
+
+ </div>
</div>
- </form>
+ <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col>
+ <label>������ ( ������������������ )</label>
+ </div>
+ <div nz-form-control nz-col>
+ <nz-select name="_device" style="width: 100%;" [ngModel]="_device" (ngModelChange)="setDevice($event)" nzAllowClear [nzPlaceHolder]="'������ ���������(������������������)'"
+ nzShowSearch (nzSearchChange)="deviceChange($event)" [nzNotFoundContent]="'������������'">
+ <nz-option *ngFor="let option of devices" [nzLabel]="option.name" [nzValue]="option">
+ </nz-option>
+ </nz-select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div nz-row [nzGutter]="16">
+ <div nz-col nzMd="6" nzSm="12" nzXs="24">
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col>
+ <label>������������</label>
+ </div>
+ <div nz-form-control nz-col >
+ <nz-select name="_dataTimeUnits" style="width: 100%;" [ngModel]="_dataTimeUnits" (ngModelChange)="setDataTimeUnits($event)" [nzPlaceHolder]="'������ ������������'">
+ <nz-option *ngFor="let option of dataTimeUnitsList" [nzLabel]="option.label" [nzValue]="option">
+ </nz-option>
+ </nz-select>
+ </div>
+
+ </div>
+ </div>
+ <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col>
+ <label>������������</label>
+ </div>
+ <div nz-form-control nz-col >
+ <nz-select name="_actualTime" style="width: 100%;" [ngModel]="_actualTime" (ngModelChange)="setActualTime($event)" [nzPlaceHolder]="'��������� ���������������������'"
+ [nzDisabled]="actualTimeDisabled">
+ <nz-option *ngFor="let option of actualTimes" [nzLabel]="option" [nzValue]="option">
+ </nz-option>
+ </nz-select>
+ </div>
+ </div>
+ </div>
+ <div nz-col [nzMd]="{span:6, offset:3}" nzSm="12" nzXs="24">
+ <div nz-form-item nz-row>
+ <div nz-form-label nz-col>
+ <span> </span>
+ </div>
+ <div nz-form-control nz-col >
+ <button nz-button [nzType]="'primary'"
+ (click) = "search($event)" [disabled]="false" class="mr-sm">
+ <i class="anticon anticon-search"></i>
+ <span>������</span>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
</nz-card>
+</form>
+<div echarts [options]="chartOption" class="line-chart" (chartInit)="onChartInit($event)"></div>
--
Gitblit v1.8.0