解决冲突

src/components/MapboxMaps/RightShowInfo/index.vue

@@ -1,9 +1,5 @@
 <template>
-<<<<<<< HEAD
-  <a-drawer class="right-show-info" placement="right"  :open="isOpen" @close="handlerClose">
-=======
   <a-drawer class="right-show-info" placement="right" :open="open" @close="() => (open = false)">
->>>>>>> 2aed0750b8d9679d2f0bc47b0c629ecf78313c2c
     <div class="title">
       <div class="tag"></div>
       <div class="title-text">操作</div>
@@ -20,27 +16,9 @@
 </template>
 
 <script setup lang="ts">
-<<<<<<< HEAD
-import { ref,defineProps,defineEmits } from "vue"
-import './index.scss'
-
-const props = defineProps({
-  isOpen:{
-    type:Boolean,
-    default:false
-  }
-})
-
-const emits = defineEmits(['handlerClose'])
-
-const handlerClose = () => {
-  emits("handlerClose",false)
-}
-
-
-=======
   import { ref, defineProps, watch } from 'vue';
   import './index.scss';
+
   const open = ref(true);
   const props = defineProps(['openModal']);
   watch(
@@ -49,7 +27,6 @@ const handlerClose = () => {
       open.value = newValue;
     },
   );
->>>>>>> 2aed0750b8d9679d2f0bc47b0c629ecf78313c2c
 </script>
 
 <style lang="scss" scoped>