From e86e4f95fcca349107237f8f4161b9c91e279af1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 11:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/devices/basic-info/device-edit/device-edit.component.ts | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 8158269..49cb12b 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
@@ -81,7 +81,7 @@
return item.id === monitorPoint.id;
}
);
- if ( hasSelectedValue ) {
+ if ( !hasSelectedValue ) {
this.monitorPoints.push(monitorPoint);
}
}
@@ -102,8 +102,8 @@
return item.id === deviceVersion.id;
}
);
- if ( hasSelectedValue ) {
- this.monitorPoints.push(deviceVersion);
+ if ( !hasSelectedValue ) {
+ this.deviceVersions.push(deviceVersion);
}
}
}
@@ -123,8 +123,8 @@
return item.id === operateUser.id;
}
);
- if ( hasSelectedValue ) {
- this.monitorPoints.push(operateUser);
+ if ( !hasSelectedValue ) {
+ this.operateUsers.push(operateUser);
}
}
}
--
Gitblit v1.8.0