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

chenyabin

2021-04-13 3c93d885a3bc6a84079cc347bb30888d5fb98f11

 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)
@@ -82,9 +82,9 @@

    // 绑定弹框实例
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.$mount()
    const instance = new PublicBounced().$mount()
    document.body.appendChild(instance.$el)
    // document.body.removeChild(instance.$el)
    // 通过方法 向绑定弹框传递数据
    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
    /* flyTo()弹出框平移事件 */