From 6da582b887cf7ceadf1617417d7c15b239a2e008 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:08 +0800
Subject: [PATCH] 设备mac地址唯一性检验，查询数据行业添加
---
src/app/routes/reports/query/query.component.html | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/app/routes/reports/query/query.component.html b/src/app/routes/reports/query/query.component.html
index 069b653..c9a8156 100644
--- a/src/app/routes/reports/query/query.component.html
+++ b/src/app/routes/reports/query/query.component.html
@@ -2,12 +2,14 @@
<h1>������������</h1>
</div>
<nz-card [nzBordered]="false">
- <form nz-form (ngSubmit)="loadGrid()" [nzLayout]="'inline'">
+ <form nz-form [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 [ngStyle]="{'width': '100px'}" nz-form-label>
+ <label>
+ ������({{ sensorsSelect+'/'+sensorsLength }})
+ </label>
</div>
<div nz-form-control class="flex-1">
<nz-popover [nzPlacement]="'bottomLeft'" [(nzVisible)]="sensorSelectVisible" [nzTrigger]="'click'">
@@ -27,12 +29,19 @@
</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]="8" class="mb-md">
+ <div nz-col [nzSpan]="9" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div [ngStyle]="{'width': '120px'}" nz-form-label>
<label>������������</label>
</div>
<div nz-form-control class="flex-1">
@@ -43,9 +52,9 @@
</div>
</div>
</div>
- <div nz-col [nzSpan]="8" class="mb-md">
+ <div nz-col [nzSpan]="7" class="mb-md">
<div nz-form-item class="d-flex">
- <div nz-form-label>
+ <div nz-form-label>
<label>������������</label>
</div>
<div *ngIf="timeUnit.value!='MONTH'; else elseBlock" nz-form-control class="flex-1">
@@ -67,7 +76,7 @@
<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': '70px'}" nz-form-label>
+ <div [ngStyle]="{'width': '100px'}" nz-form-label>
<label>���������</label>
</div>
<div nz-form-control class="flex-1">
@@ -77,21 +86,30 @@
</div>
</div>
</div>
- <div nz-col [nzSpan]="8" class="mb-md">
+ <div nz-col [nzSpan]="9" class="mb-md">
<div nz-form-item class="d-flex">
- <div [ngStyle]="{'width': '70px'}" nz-form-label>
- <label>������������</label>
+ <div [ngStyle]="{'width': '120px'}" 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="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-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]="8" class="mb-md">
+ <div nz-col [nzSpan]="7" class="mb-md">
<div nz-form-item class="d-flex">
<div [ngStyle]="{'width': '70px'}" nz-form-label>
<label>��� ���</label>
@@ -108,7 +126,7 @@
</div>
<div nz-row>
<div nz-col [nzSpan]="24" class="text-right">
- <button nz-button [nzType]="'primary'">
+ <button nz-button [nzType]="'primary'" (click)="loadGrid()">
<i class="anticon anticon-search"></i>
<span>������</span>
</button>
--
Gitblit v1.8.0