From efe936a73370a55d4c3336fb9973a92fcf87efff Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:09 +0800
Subject: [PATCH] ts语法修正，报表部分功能实现
---
src/app/routes/analysis/query/query.component.html | 154 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 118 insertions(+), 36 deletions(-)
diff --git a/src/app/routes/analysis/query/query.component.html b/src/app/routes/analysis/query/query.component.html
index 97a90da..8d782a2 100644
--- a/src/app/routes/analysis/query/query.component.html
+++ b/src/app/routes/analysis/query/query.component.html
@@ -3,49 +3,131 @@
<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}}
+ <a class="ant-dropdown-link" nz-dropdown>
+ <p class="display-2">{{ lineChartSensorName }}
+ <i class="anticon anticon-down"></i>
</p>
- </li>
- </ul>
+ </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>
<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>
+ <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>
- <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 *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"
+ [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"/>
+ <ng-template #elseBlock>
+ <div nz-col [nzSm]="8" class="header-info">
+ <p class="text-grey-dark">���������������������</p>
+ <nz-input-number style="width: 42%;" [(ngModel)]="startYear" [nzMin]="minStartYear" [nzMax]="maxStartYear" [nzStep]="1" [nzAllowClear]="false"></nz-input-number>
+ <span>-</span>
+ <nz-input-number style="width: 42%;" [(ngModel)]="endYear" [nzMin]="minEndYear" [nzMax]="maxEndYear" [nzStep]="1" [nzAllowClear]="false"></nz-input-number>
+ </div>
+ </ng-template>
</div>
-</nz-card>
\ No newline at end of file
+</nz-card>
+<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>
+ <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>
+ <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 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>
+ <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 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>
+ </form>
+</nz-card>
--
Gitblit v1.8.0