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

chenyabin

2021-05-13 097581b136c5889c71c07fb6f17d2f2885ce5a78

 src/components/panel/RightSearchPanel.vue

@@ -86,7 +86,6 @@
      hbVisible: false,
      pkVisible: false,
      toggleMonitorStyle: 'right:0px',

      title: '污雨水管网',
      isCollapse: true,
      selectGroup: false
@@ -222,7 +221,13 @@
      that.gcComp = ''
      that.topicList.forEach((item) => {
        if (item.name === obj.name) {
          item.isShow = obj.checked
          // console.log(obj)
          if (obj.type > 0) {
            item.isShow = true
          } else {
            item.isShow = false
          }
          // item.isShow = obj.checked
          if (item.isShow) {
            that.selected(item)
          } else {