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

chenyabin

2021-05-13 b3ad6bfdc52f880a8efc79ece6acae12229d4198

 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 {
@@ -688,12 +693,16 @@
  }

  .footer-page {
    position: absolute;
   // position: absolute;
    background-color: transparent !important;
    bottom: 10px !important;
    margin-left: 0px;
  //  bottom: 10px !important;
   // margin-left: 0px;
    border: none;

    margin: 0;
    border-top: 1px solid rgba(0, 255, 246, 0.14);
   .el-card__body{
     padding: 5px;
   }
    .warnPagination {
      .btn-quicknext, .btn-quickprev {
        color: #e4e8f1 !important;