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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/components/panel/topicSearch/SewersSearch.vue

@@ -27,6 +27,12 @@
                                </el-option>
                            </el-select>
                        </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-input>
                            <el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -187,6 +193,7 @@
      // }
      // const _this = this
      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
      console.log(res)
      if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
        this.total = res.totalFeatures
        this.list = res.features