From 09df6ca2ec26022c10a7f5dcf241a8075bd8a9dc Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 14 四月 2021 10:12:50 +0800
Subject: [PATCH] 冲突修复
---
src/components/panel/topicSearch/GasWasteSearch.vue | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index c852889..b390331 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,24 +97,15 @@
</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: [],
--
Gitblit v1.8.0