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/devices/basic-info/device-edit/device-edit.component.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
index 840dbd7..a5845e8 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
@@ -11,7 +11,7 @@
</nz-input>
</div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>mac</label>
+ <label nz-form-item-required>mac</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
<nz-input formControlName="mac" maxlength="20" [nzPlaceHolder]="'mac������'">
@@ -57,7 +57,7 @@
</nz-option>
</nz-select>
</div>
- </div>
+ </div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<label>���������</label>
@@ -76,23 +76,23 @@
<nz-input formControlName="address" maxlength="20" [nzPlaceHolder]="'���������������������������'">
</nz-input>
</div>
- </div>
+ </div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<label>������������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
<nz-datepicker nzSize="large" style="width: 100%;" formControlName="createTime" nzShowTime [nzPlaceHolder]="'������������'"
- [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+ [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
</div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<label>������������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
<nz-datepicker nzSize="large" style="width: 100%;" formControlName="installTime" nzShowTime [nzPlaceHolder]="'������������'"
- [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+ [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
</div>
- </div>
+ </div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">������</button>
<button nz-button [nzType]="'primary'" [nzLoading]="isSaving">
@@ -102,4 +102,4 @@
</span>
</button>
</div>
- </form>
\ No newline at end of file
+ </form>
--
Gitblit v1.8.0