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

徐旺旺

2021-03-31 7b232ced13ebee7c5df869f25c55d3d4e21d68a0

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

 src/components/LayerController/logic/Company.js

@@ -19,10 +19,10 @@
      layer: layer
    })
    const res = await mapApi.getCompany()
    console.log(res)
    // console.log(res)
    const data = res.Result.DataInfo || {}
    for (let i = 0; i < data.length; i++) {
      console.log(data[i])
      // console.log(data[i])
      // 经纬度 位置
      const positionX = data[i].Latitude
      const positionY = data[i].Longitude
@@ -33,7 +33,14 @@
          iconUrl: iconUrl,
          iconSize: [50, 50],
          iconAnchor: [25, 25]
        })
        }),
        test: data[i]
      })
      marker.bindTooltip(data[i].name, {
        permanent: true,
        offset: [0, -16],
        direction: 'top',
        className: ''
      })

      layer.addLayer(marker)
@@ -41,13 +48,13 @@
  }

  this.bindTooltip = (layer) => {
    console.log(layer)
    return '企业'
    // console.log(layer)
    // return layer.options.test.name
  }

  this.clickListener = (e) => {
    this.animalService.pulseEffect(e.latlng)
    // this.animalService.pulseEffect(e.latlng)
    console.log(e)
    return this.PublicBounced.$el
    // return this.PublicBounced.$el
  }
}