Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

seatonwan9

2021-05-31 94ae577b548d2f4c51f82f57feadde0048a69f9a

 src/components/helpers/MapManager.js

@@ -30,7 +30,9 @@
      this.loadWfsDatas(e.latlng).then((res) => {
        if (res.features.length > 0) {
          highlight(res.features[0])
          openPropsPopup(e.latlng, res.features)
          if (this.clickDialogSwitch) {
            openPropsPopup(e.latlng, res.features)
          }
        }
      })
    })
@@ -42,7 +44,7 @@
      var point = this.map.latLngToContainerPoint(latlng, this.map.getZoom())
      const wmsLayerService = window.layerFactory.wmsLayerService
      const layers = wmsLayerService.wmsLayerList.getLayers()
      // const filters = wmsLayerService.wmsLayerList.getFilters()
      const filters = wmsLayerService.wmsLayerList.getFilters()
      const wmsParams = Object.assign({
        LAYERS: layers,
        QUERY_LAYERS: layers,
@@ -52,6 +54,9 @@
        Y: Math.round(point.y),
        BBOX: this.map.getBounds().toBBoxString()
      }, this.defaultWmsParams, params)
      if (filters) {
        wmsParams.CQL_FILTER = filters
      }
      AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
        resolve(res.data)
      })