Merge remote-tracking branch 'origin/master'

YANGDL

2021-03-05 c4044fb60e53e5c83da4ee645d5160f914e422a3

 src/components/helpers/ServiceLayerHelper.js

@@ -37,7 +37,7 @@
          if (layer.minZoom) {
            if (zoom > layer.minZoom) {
              var layerObj = that.layerArray[layer.code]
              layerObj.addTo(that.map)
              layerObj && layerObj.addTo(that.map)
            } else {
              that.removeLayer(layer)
            }
@@ -161,10 +161,13 @@
      .bindTooltip(function (layer) {
        const nameId = layer.feature.id
        let name = ''
        if (nameId.indexOf('三通') !== -1 || nameId.indexOf('四通') !== -1) {
        if (nameId.indexOf('三通') !== -1 || nameId.indexOf('四通') !== -1 || nameId.indexOf('窨井') !== -1) {
          name = layer.feature.properties.pointnumber
        } else {
          name = layer.feature.properties.name
        }
        if (name === undefined) {
          name = ''
        }
        return name
      }, { direction: 'bottom', offset: [0, 15], sticky: true })
@@ -208,7 +211,8 @@
  }

  removeLayer (item) {
    this.map.removeLayer(this.layerArray[item.code])
    var layer = this.layerArray[item.code]
    layer && this.map.removeLayer(layer)
  }

  /**