Food/food
3
0
Fork 0
Code Issues 60 Pull Requests Actions Packages Projects Releases Wiki Activity

【类 型】：git同步

Browse Source 
【原  因】：
【过  程】：
【影  响】：
This commit is contained in:
szdot 2024-07-24 21:45:12 +08:00
parent 2f7d128d73
commit 60473bb245
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/layout/components/main/planes/index.vue
View File

@ -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>