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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/panel/RightSearchPanel.vue

@@ -17,7 +17,8 @@
                @click="()=>{selected(item)}" v-show="item.isShow">
              <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
                <li>
                  <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
                  <!-- <img src="../../assets/images/map-pages/icon/sl.png" class="icon"> -->
                  <i class="icon iconfont" :class="item.icon"></i>
                </li>
              </el-tooltip>
            </ul>
@@ -57,6 +58,9 @@
import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch'
import SewersSearch from '@components/panel/topicSearch/SewersSearch'
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
import PipeChangesSearch from '@components/panel/topicSearch/pipeChangesSearch.vue'
import PipeInformationSearch from '@components/panel/topicSearch/pipeInformationSearch.vue'

import bus from '@/eventBus'

export default {
@@ -143,6 +147,12 @@
        case '管线':
          this.gcComp = SewersSearch
          break
        case '管道变更':
          this.gcComp = PipeChangesSearch
          break
        case '管道信息':
          this.gcComp = PipeInformationSearch
          break
      }
    },
    handlePage (page) {