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

chenyabin

2021-05-18 8dc33d1e8da59e87a2be6b921ac96600d7786685

 src/components/panel/topicSearch/SewersSearch.vue

@@ -83,7 +83,7 @@
// 引入组件内容
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
import { fitBounds, highlight } from '../../helpers/LocateHelper'
import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'

export default {
  name: 'SewersSearch',
@@ -162,12 +162,11 @@
      }
    },
    handleLocation (val, index) {
      console.log(this.form.dataType)
      // console.log(val)
      this.activeNum = index
      // layer && layer.openPopup()
      fitBounds(val, this.form.dataType.code)
      highlight(val, this.form.dataType)
      const config = this.form.dataType
      locate(val, config)
    },
    btnAffiliatedFacilities (val, index) {
      this.activeNum = index