From e13e2e4af65c6e32cc6a8597ade8b4102ef3b4ec Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 14 四月 2021 10:11:24 +0800
Subject: [PATCH] 修复

---
 src/components/panel/topicSearch/GasWasteSearch.vue |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 80c2f12..c852889 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,17 +97,24 @@
 </template>
 
 <script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
+<<<<<<< HEAD
 import WfsHelper from '@components/helpers/WfsHelper'
 import AjaxUtils from '@utils/AjaxUtils'
+=======
+import mapApi from '@/api/mapApi'
+
+// import WfsHelper from '@components/helpers/WfsHelper'
+>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
 export default {
   name: 'GasWasteSearch',
   data () {
     return {
       gdVisible: true,
       list: [],
-      labelList: PipelineTypeOptions[0].labelList,
+<<<<<<< HEAD
+=======
+      // labelList: PipelineTypeOptions[0].labelList,
+>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
       total: 0,
       inareaTypeOptions: [],
       enterpriseTypeOptions: [],
@@ -160,11 +167,13 @@
         dataType: this.form.dataType
       }
       console.log(param)
-      var wfsHelper = new WfsHelper()
-      wfsHelper.addTypeName(this.form.query.layerName)
-      wfsHelper.addLike(this.form.query.key, this.form.keyword)
+      // var wfsHelper = new WfsHelper()
+      // wfsHelper.addTypeName(this.form.query.layerName)
+      // wfsHelper.addLike(this.form.query.key, this.form.keyword)
       // const _this = this
-      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+      // const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+      const res = await mapApi.getWasteGas()
+      console.log(res)
       if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
         this.list = res.data.features
       }

--
Gitblit v1.8.0