Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-28 e86e4f95fcca349107237f8f4161b9c91e279af1

Merge remote-tracking branch 'origin/develop' into develop

 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);
               }
           }
      }