省市区兼容旧版本

fengxiang

2018-06-19 27bd4a08bf807f4f6132bb524da33490b6d22f87

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

@@ -40,7 +40,12 @@
        format: (value: any, col: Column, row: any) => {
          value = value == null ? '' : value;
          if (row['areaNames'] != null) {
            return row['areaNames']['provinceName'] + row['areaNames']['cityName'] + row['areaNames']['areaName'] + value;
            return row['areaNames']['provinceName'] 
              + (!!row['areaNames']['cityName'] ? row['areaNames']['cityName'] : '')
              + (!!row['areaNames']['areaName'] ? row['areaNames']['areaName'] : '')
              + (!!row['areaNames']['townName'] ? row['areaNames']['townName'] : '')
              + (!!row['areaNames']['villageName'] ? row['areaNames']['villageName'] : '')
              + value;
          } else {
            return value;
          }
@@ -183,13 +188,13 @@
    const areaNames = record.areaNames;
    let adress = '';
    if (areaNames != null) {
      adress += !!areaNames.provinceName?areaNames.provinceName:'';
      adress += !!areaNames.provinceName ? areaNames.provinceName : '';
      adress += ' ';
      adress += !!areaNames.cityName?areaNames.cityName:'';
      adress += !!areaNames.cityName ? areaNames.cityName : '';
      adress += ' ';
      adress += !!areaNames.areaName?areaNames.areaName:'';
      adress += !!areaNames.areaName ? areaNames.areaName : '';
      adress += ' ';
      adress += !!record.address?record.address:'';
      adress += !!record.address ? record.address : '';
    }
    this.coorPickerService.data.address = adress;
    this.coorPickerService.data['describe'] = '监控站点名称';