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

chenyabin

2021-04-14 2b814076d8a1ba1ec21227aa30cf549db4587aa4

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -141,7 +141,7 @@
  methods: {
    setBounced (val) {
      const pos = [val.Latitude, val.Longitude]
      window.map.flyTo(pos, 16)
      window.map.flyTo(pos, 11)
    },
    handlePipelineType (val) {
      this.solidWasteTypeOptions.forEach(item => {