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

yangdelong

2021-05-26 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -53,6 +53,12 @@
                            class="levelOfRisk-type">{{item.name}}</span></el-radio>
                </el-radio-group>
                <!--              <el-form-item >-->
                <div class="page_total">
                    <p>共计
                        <span>{{total}}</span>
                        条记录
                    </p>
                </div>
                <div class="rightButtonSearch">
                    <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索">
                        <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
@@ -104,7 +110,7 @@
<script>

import mapApi from '@/api/mapApi'
import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
import WasteWaterIndex from '../../base-page/WasteWater/WasteWaterIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'

export default {
@@ -114,7 +120,10 @@
    return {
      gdVisible: true,
      list: [],
      // 搜索到的数据数量
      total: 0,
      // 分页
      pageSize: 10,
      inareaTypeOptions: [],
      enterpriseTypeOptions: [],
      enterpriseSubunitsTypeOptions: [],
@@ -153,6 +162,11 @@
    }
  },
  methods: {
    // 页面切换 分页功能
    handlePage (page) {
      // this.wfsHelper.setPage(page)
      this.handleSearch()
    },
    // 区域筛选
    areaType (val) {
      this.pipelineTypeOptions.forEach((itm) => {
@@ -192,7 +206,7 @@
      window.map.setView(pos, 15)
      window.$layer.open({
        content: {
          content: WasteWaterIndex, // 组件
          comp: WasteWaterIndex, // 组件
          parent: this, // 父组件
          data: { // 传递的参数
            storagePlaceId: val