Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-07-05 44e258acff991838ad7f10276556b596b6b0b25b

 src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts

@@ -32,7 +32,7 @@
    let _areas = null;
    if (areaNames != null) {
      _areas = {
       label: Object.values(areaNames).join('/'),
       label: Object.values(areaNames).filter(d=>d).join('/'),
       value: data.areaCode
      };
    }