From 6f256a8be5c330cbf4d852f7dc4a1a6614f0419d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:11:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/GasWasteSearch.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index b95c164..c852889 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,14 +97,24 @@
</template>
<script>
+<<<<<<< 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: [],
+<<<<<<< HEAD
+=======
+ // labelList: PipelineTypeOptions[0].labelList,
+>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
@@ -157,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