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

yangdelong

2021-05-28 3054bbce49457c82df9ad32523f3a0186e268d6f

 src/components/LayerController/service/WfsLayerService.js

@@ -63,8 +63,15 @@
            })
        },
        onEachFeature: (feature, layer) => {
          const popupDatas = []
          const properties = feature.properties
          popupDatas.push({
            title: properties.wellname || properties.devicename || properties.name,
            name: feature.id,
            content: properties
          })
          layer.bindPopup((layer) => {
            this.popupComp.setDatas(layer)
            this.popupComp.setDatas(popupDatas)
            this.popupComp.setShow()
            return this.popupComp.$el
          }, {
@@ -127,4 +134,5 @@
    return name
  }
}

export default WfsLayerService