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

chenyabin

2021-04-12 de01693a063433610388fab33cd4927f2f663e60

 src/components/LayerController/logic/SolidWaste.js

@@ -4,7 +4,7 @@

// 区分不同类型 使用不同img
const defaultImg = '/assets/images/map/solidwaste/voc.png'
const setting = '/assets/images/map/solidwaste/gf_green.png'
const setting = '/assets/images/map/solidwaste/gf_green2.png'

// 请求接口数据
const mapApi = require('../../../api/mapApi').default
@@ -39,8 +39,8 @@
        totransferData: getSolidWasteData[i],
        icon: L.icon({
          iconUrl: iconUrl,
          iconSize: [20, 20],
          iconAnchor: [25, 25]
          iconSize: [30, 30],
          iconAnchor: [15, 15]
        })
      })
      layer.addLayer(marker)