From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

---
 src/app/routes/raise-dust/statistical-query/statistical-query.component.html |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/raise-dust/statistical-query/statistical-query.component.html b/src/app/routes/raise-dust/statistical-query/statistical-query.component.html
index e9d3bb7..3f077f8 100644
--- a/src/app/routes/raise-dust/statistical-query/statistical-query.component.html
+++ b/src/app/routes/raise-dust/statistical-query/statistical-query.component.html
@@ -1,4 +1,70 @@
 <div class="content__title">
-    <h1>Page Name</h1>
+    <h1>������������</h1>
 </div>
-<pro-header [title]="'Page Name'"></pro-header>
+
+<nz-card [nzBordered]="false">
+	<form nz-form  (ngSubmit)="reportQuery()" [nzLayout]="'inline'">
+		<div nz-row [nzGutter]="24" >
+			<div nz-col nzXs="24" nzSm="12" nzMd="6" class="mb-md">
+				<div nz-form-item class="d-flex">
+					<div nz-form-label class="label-width-70">
+						<label>������</label>
+					</div>
+					<div nz-form-control class="flex-1">
+						<nz-select [(ngModel)]="sensor" name="sensor" [nzSize]="'large'" [nzPlaceHolder]="'���������  ������'">
+							<nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option"></nz-option>
+            			</nz-select>
+					</div>
+				</div>
+			</div>
+			<div nz-col nzXs="24" nzSm="12" nzMd="6"  class="mb-md">
+				<div nz-form-item class="d-flex">
+					<div nz-form-label class="label-width-70">
+						<label>������������</label>
+					</div>
+					<div nz-form-control class="flex-1">
+						<nz-select [(ngModel)]="monitorPoint" name="monitorPoint" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"  
+							[nzNotFoundContent]="'������������'"  nzShowSearch> 
+							<nz-option *ngFor="let option of monitorPointOptions"  [nzLabel]="option['name']" [nzValue]="option"> </nz-option> 
+						</nz-select>
+					</div>
+				</div>
+			</div>
+			<div nz-col nzXs="24" nzSm="12" nzMd="6"  class="mb-md">
+				<div nz-form-item class="d-flex">
+					<div nz-form-label class="label-width-70">
+						<label>������</label>
+					</div>
+					<div nz-form-control class="flex-1">
+						<nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'">
+							<nz-option *ngFor="let option of typeOptions" [nzLabel]="option.label" [nzValue]="option" ></nz-option>
+            			</nz-select>
+					</div>
+				</div>
+			</div>
+			<div nz-col nzXs="24" nzSm="12" nzMd="6"  class="mb-md">
+				<div nz-form-item class="d-flex">
+					<div nz-form-label class="label-width-70">
+						<label>������</label>
+					</div>
+					<div nz-form-control class="flex-1">
+						<nz-datepicker style="width: 100%;" [(ngModel)]="time" name="time" [nzFormat]="timeType.format" [nzDisabledDate]="_disabledDate" [nzAllowClear]="false"
+							[nzMode]="timeType.value=='hour'||timeType.value=='day'?'day':'month'" [nzShowTime]="timeType.value=='hour'?true:false" [nzSize]="'large'"></nz-datepicker>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div nz-row [nzGutter]="24">
+			<div nz-col nzXs="24" nzSm="12" nzMd="6"  class="mb-md">
+				<button nz-button type="submit" [nzType]="'primary'" [nzSize]="'large'">
+					������
+				</button>
+			</div>
+		</div>
+	</form>
+</nz-card>
+
+<nz-card [nzBordered]="false">
+	<div id="mydiv" style="height: 485.35px; width: 100%"></div>
+</nz-card>

--
Gitblit v1.8.0