冲突修复

徐旺旺

2021-04-14 09df6ca2ec26022c10a7f5dcf241a8075bd8a9dc

冲突修复

 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: [],