From 60473bb245c63448255c2fd54440349ae2ff8647 Mon Sep 17 00:00:00 2001
From: szdot <szdot@qq.com>
Date: Wed, 24 Jul 2024 21:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Agit=E5=90=8C=E6=AD=A5=20=E3=80=90=E5=8E=9F=20=20?=
 =?UTF-8?q?=E5=9B=A0=E3=80=91=EF=BC=9A=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/main/planes/index.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue
index 6337654..92b16ec 100644
--- a/src/views/layout/components/main/planes/index.vue
+++ b/src/views/layout/components/main/planes/index.vue
@@ -2,15 +2,9 @@
   <div class="h-100">
     <map-box ref="mapbox" :key="mapBoxKey">
       <template #content>
-<<<<<<< HEAD
-        <!-- <PlaneStatus :plane="plane" /> -->
-        <As style="position:absolute;" />
-        <!-- <ControllerTabs :plane="plane" @mapXOffset="mapXOffset" @makeRoute="makeRoute" @clearRoute="clearRoute" /> -->
-=======
         <BatteryStatus :plane="plane" />
         <PlaneStatus :plane="plane" />
         <ControllerTabs :plane="plane" @mapXOffset="mapXOffset" @makeRoute="makeRoute" @clearRoute="clearRoute" />
->>>>>>> c4f06be21d8dfc2a3299a8751200d08811bb8d9a
       </template>
     </map-box>
   </div>