From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/SewersSearch.vue |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index ce3356e..1948348 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -177,11 +177,12 @@
       this.wfsHelper.setTypeName([this.form.dataType.typeName])
       if (this.form.keyword) {
         this.wfsHelper.addLike('name', this.form.keyword)
+        this.wfsHelper.setFilter(this.form.keyword)
       }
-      const filter = this.form.dataType.filter
-      if (filter) {
-        this.wfsHelper.setFilter(filter)
-      }
+      // const filter = this.form.dataType.filter
+      // if (filter) {
+      //   this.wfsHelper.setFilter(filter)
+      // }
       // const _this = this
       const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
       if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {

--
Gitblit v1.8.0