From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/analysis/query/query.component.html | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/app/routes/analysis/query/query.component.html b/src/app/routes/analysis/query/query.component.html
new file mode 100644
index 0000000..97a90da
--- /dev/null
+++ b/src/app/routes/analysis/query/query.component.html
@@ -0,0 +1,51 @@
+<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>
+ <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>
+ <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-card>
\ No newline at end of file
--
Gitblit v1.8.0