合并冲突

src/views/task-manage/all-task/components/DemandDrawer.vue

@@ -42,7 +42,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 import { defineComponent, computed, reactive, toRefs, onMounted, ref, watch } from 'vue'
 import { Map, View, Feature } from 'ol'
 import 'ol/ol.css'
@@ -57,10 +56,6 @@ import { Draw } from 'ol/interaction'
 import { toRaw } from '@vue/reactivity'
 import * as control from 'ol/control'
 import { styleList } from '../tools/style.js'
-=======
-import BaseMap from './BaseMap.vue'
-import { defineComponent, computed, reactive, toRefs } from 'vue'
->>>>>>> 1762facaae24878e796d6ef485ffabf56b51a3c8
 
 // 视频组件
 import VideoPlayer from '@/components/VideoPlayer/index.vue'