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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/conf/layers/LayerWasteWater.js

@@ -14,7 +14,8 @@
      sname: '排放口', // 表名
      checked: false, // 默认选中状态
      type: 0,
      url: 'http://www.baidu.com'
      url: 'http://www.baidu.com',
      legendImage: '../.././assets/images/map/sewers/污水排口.png'
    },
    {
      code: 'wasteWaterJcd',
@@ -22,7 +23,8 @@
      sname: '流量',
      checked: false, // 默认选中状态
      type: 0,
      url: 'http://www.baidu2.com'
      url: 'http://www.baidu2.com',
      legendImage: '../.././assets/images/map/sewers/流量计.png'
    },
    {
      code: 'wasteWaterfk',
@@ -30,7 +32,8 @@
      sname: '液位',
      checked: false, // 默认选中状态
      type: 0,
      url: ''
      url: '',
      legendImage: '../.././assets/images/map/sewers/液位计.png'
    }
  ]
}