From 6d4e23a29f40b4739aa46436e5b703ecde4b39aa Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 11:37:00 +0800
Subject: [PATCH] table数据
---
src/components/panel/topicSearch/GasWasteSearch.vue | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index c852889..810d5ec 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,24 +97,18 @@
</template>
<script>
-<<<<<<< HEAD
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
-=======
+// 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: [],
--
Gitblit v1.8.0