解决冲突

src/views/demo/workmanagement/flightoperation/src/Patrol.vue

@@ -130,7 +130,7 @@
   const pageWidth = document.documentElement.clientWidth;
   const width = ref(300);
   const height = ref(550);
-  const left = ref(0);
+  const left = ref(pageWidth - 620);
   const top = ref(100);
   const zIndex = ref(props.zIndex);
   const data = reactive({