From 521e90a01a6249834e12e68a930e4d3e239b0a2d Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Feb 2018 13:11:18 +0800
Subject: [PATCH] BUGFIX-176
---
src/app/routes/devices/basic-info/device-edit/device-edit.component.ts | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
index fc97214..8158269 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -39,7 +39,7 @@
}
const validates:Device = {
name:[data.name,[Validators.required]],
- mac:[data.mac],
+ mac:[data.mac,[Validators.required]],
deviceVersionId:[data.deviceVersionId],
monitorPointId:[data.monitorPointId],
operateUserId:[data.operateUserId],
@@ -71,7 +71,7 @@
const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
this.monitorPointService.getPagingList(pageBean, text).subscribe(
(res: PageBean) => {
- if (res != null && res.data != null) {
+ if (res != null && res.data != null) {
this.monitorPoints = res.data;
}
const monitorPoint = this.data.monitorPoint;
@@ -83,7 +83,7 @@
);
if ( hasSelectedValue ) {
this.monitorPoints.push(monitorPoint);
- }
+ }
}
}
);
@@ -92,7 +92,7 @@
const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
this.versionService.getPagingList(pageBean, text).subscribe(
(res: PageBean) => {
- if (res != null && res.data != null) {
+ if (res != null && res.data != null) {
this.deviceVersions = res.data;
}
const deviceVersion = this.data.deviceVersion;
@@ -104,7 +104,7 @@
);
if ( hasSelectedValue ) {
this.monitorPoints.push(deviceVersion);
- }
+ }
}
}
);
@@ -113,7 +113,7 @@
const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
this.operateUserService.getPagingList(pageBean, text).subscribe(
(res: PageBean) => {
- if (res != null && res.data != null) {
+ if (res != null && res.data != null) {
this.operateUsers = res.data;
}
const operateUser = this.data.operateUser;
@@ -125,7 +125,7 @@
);
if ( hasSelectedValue ) {
this.monitorPoints.push(operateUser);
- }
+ }
}
}
);
--
Gitblit v1.8.0