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

yangdelong

2021-05-29 de7390c66ef3e3fe316e804495a78d05a01f0160

 src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue

@@ -18,8 +18,8 @@
                <!--            </el-pagination>-->
            </el-row>
        </el-scrollbar>
        <el-row>
            <el-button type="primary" @click="confirm" style="text-align: right">确认</el-button>
        <el-row style="text-align: right">
            <el-button type="primary" @click="confirm">确认</el-button>
        </el-row>
    </div>
</template>
@@ -37,11 +37,12 @@
    return {
      // 点击定位绑定数据
      clickLocation: '',
      searchList: []
      searchList: [],
      marker: null
    }
  },
  methods: {
    // 获得焦点 进行定位
    // 搜索定位
    focusLocation () {
      // console.log(this.clickLocation)
      // console.log(window.map.getZoom())
@@ -75,6 +76,7 @@
        //   }
        // }
      })
      this.clickLocation = ''
    },
    // 点击定位
    locationMapClick (val) {
@@ -87,7 +89,7 @@
      //   iconSize: 16
      // })
      const htmls = '<div><ul><li>' + val.name + '</li> <br/> <li>' + val.address + '</li> <br/> <li>' + val.phone + '</li></ul></div>'
      const marker = window.L.marker([ps[1], ps[0]], {
      this.marker = window.L.marker([ps[1], ps[0]], {
        icon: window.L.icon({
          iconUrl: iconUrl,
          iconSize: [30, 30],
@@ -102,16 +104,17 @@
          sticky: true,
          className: ''
        })
      window.map.addLayer(marker)
      window.map.addLayer(this.marker)
      window.map.setView([ps[1], ps[0]], 17)
      pulseEffect([ps[1], ps[0]])
    },
    // 点击确认按钮事件
    confirm () {
      // 通过子组件向父组件传递数据
      // this.$emit('locationClick', this.LongLatPos)
      window.mapManager.clearHighlight()
      window.map.removeLayer(this.marker)
      this.searchList = []
      this.clickLocation = ''
      eventBus.$emit('location-setChange', true)
      // console.log('搜索定位')
    }
  }
}