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

yangdelong

2021-04-07 e8692ebf024715c922ca0e10f90dc3a1219862b0

 src/components/LayerController/logic/SolidWaste.js

@@ -40,7 +40,7 @@
        icon: L.icon({
          iconUrl: iconUrl,
          iconSize: [20, 20],
          iconAnchor: [25, 25]
          iconAnchor: [10, 10]
        })
      })
      layer.addLayer(marker)
@@ -88,7 +88,7 @@
    // 通过方法 向绑定弹框传递数据
    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
    /* flyTo()弹出框平移事件 */
    this.setPanTo(e.latlng, 200)
    this.setPanTo(e.latlng, 80)
  }

  // flayTo() 弹框的可滑动事件