From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-config/organization-config.component.html b/src/app/routes/systems/organization/organization-config/organization-config.component.html
index a313c29..254d2b1 100644
--- a/src/app/routes/systems/organization/organization-config/organization-config.component.html
+++ b/src/app/routes/systems/organization/organization-config/organization-config.component.html
@@ -78,7 +78,7 @@
<br/>
<br/>
<div *ngFor="let i of [1,2,3]" nz-form-item nz-row class="mb-sm">
- <div nz-form-label nz-col [nzSm]="3" [nzXs]="24">
+ <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<span [ngSwitch]="i">
<label *ngSwitchCase="1">������������������:</label>
<label *ngSwitchCase="2">������������������:</label>
@@ -96,6 +96,17 @@
<br/>
<br/>
</div>
+ <br/>
+ <div nz-form-item nz-row class="mb-sm">
+ <div nz-form-label nz-col [nzSm]="5" [nzXs]="24">
+ <span>
+ <label>������������������<small>(������������)</small>:</label>
+ </span>
+ </div>
+ <div nz-form-control nz-col [nzSpan]="12">
+ <nz-input-number style="width: 200px;" formControlName="interval" [nzParser]="parserInt" nzMin="1" nzStep="1" nzDisabled="{{ !f.value['alarmMode']['enable'] }}"></nz-input-number>
+ </div>
+ </div>
</div>
</nz-card>
<footer-toolbar errorCollect>
--
Gitblit v1.8.0