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

chenyabin

2021-05-10 204b8af237555feb1af83250dfdc28a5dc0a467c

 src/components/panel/topicSearch/SewersSearch.vue

@@ -32,7 +32,7 @@
            </div>
          </el-form>
        </div>
        <el-scrollbar style="height:380.44px;">
        <el-scrollbar style="height:413px;">
          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum==index?'hover':''">
            <img class="state" :src="getImgSrc()" style="background: none"/>
            <div>
@@ -144,11 +144,12 @@
      this.list = []
      var wfsHelper = new WfsHelper()
      // todo 现在管网还没区分开类型，后面改
      wfsHelper.addTypeName(this.form.dataType.sname)
      wfsHelper.addLike('name', this.form.keyword)
      wfsHelper.addTypeName(this.form.dataType.typeName)
      if (this.form.keyword) {
        wfsHelper.addLike('name', this.form.keyword)
      }
      // const _this = this
      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
      console.log(res)
      if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
        this.list = res.features
      }