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/image-grabbing/image-grabbing.component.html | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html b/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html
index e9d3bb7..d113e07 100644
--- a/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html
+++ b/src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html
@@ -1,4 +1,44 @@
<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 [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)]="monitorPoint" name="monitorPoint" [nzPlaceHolder]="'��������� ������������'" [nzSize]="'large'"
+ [nzNotFoundContent]="'������������'" nzShowSearch (ngModelChange)="monitorPointChange($event)">
+ <nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option.id"> </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)]="device" name="device" [nzSize]="'large'" [nzPlaceHolder]="'��������� ������'" (ngModelChange)="deviceChange($event)">
+ <nz-option *ngFor="let option of deviceOptions" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+ </nz-select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+</nz-card>
+
+<nz-card [nzBordered]="false">
+ <div nz-row [nzGutter]="24" class="pt-lg">
+ <div nz-col nzXs="24" nzSm="12" nzMd="6" class="mb-md" *ngFor="let time of times;let i = index">
+ <h3>{{time}} ������</h3>
+ <img src="./assets/img/{{i+ base}}.jpg" width="300" height="250" />
+ </div>
+ </div>
+</nz-card>
--
Gitblit v1.8.0