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

yangdelong

2021-05-26 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -30,6 +30,12 @@
                        <span class="levelOfRisk-type">{{ item.name }}</span>
                    </el-radio>
                </el-radio-group>
                <div class="page_total">
                    <p>共计
                        <span>{{total}}</span>
                        条记录
                    </p>
                </div>
                <div class="rightButtonSearch">
                    <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
                    <el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -47,6 +53,17 @@
                </div>
            </div>
        </el-scrollbar>
        <el-card class="footer-page" v-if="total > 10">
            <el-pagination
                    small
                    @current-change="handlePage"
                    :page-size=pageSize
                    layout="prev, pager, next"
                    :total=total
                    class="warnPagination"
            >
            </el-pagination>
        </el-card>
    </div>
</template>

@@ -87,10 +104,18 @@
      // 数据搜索之后，存储数据的
      items: [LayerWasteSolid],
      subItems: LayerWasteSolid.layers,
      list: []
      list: [],
      total: 0,
      // 分页
      pageSize: 10
    }
  },
  methods: {
    // 页面切换 分页功能
    handlePage (page) {
      // this.wfsHelper.setPage(page)
      this.handleSearch()
    },
    // select的option的数据选择
    handlePipelineType (val) {
      this.list = []