Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

src/views/demo/workmanagement/flightoperation/index.ts

@@ -3,3 +3,4 @@ export { default as AirportInformation } from './src/AirportInformation.vue';
 export { default as UAVInformation } from './src/UAVInformation.vue';
 export { default as AirportLive } from './src/AirportLive.vue';
 export { default as LivePreview } from './src/LivePreview.vue';
+export { default as Map } from '../workplan/components/map.vue';

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

@@ -1,5 +1,8 @@
 <template>
-  <div class="flightoperation-container">
+  <div>
+    <div style="width: 100%; height: calc(100vh - 80px)">
+      <Map></Map>
+    </div>
     <SelectComponent />
     <AirportInformation @changeLive="changeAirportLive" />
     <UAVInformation />
@@ -9,10 +12,13 @@
     <div
       class="LivePreview"
       v-if="livePreviewVisible"
-      :style="{ bottom: airportLiveVisible ? '300px' : '10px' }"
+      :style="{ bottom: airportLiveVisible ? '300px' : '20px' }"
     >
       <LivePreview />
     </div>
+    <!-- <div class="flightoperation-container">
+      
+    </div> -->
   </div>
 </template>
 <script setup lang="ts">
@@ -23,6 +29,7 @@
     UAVInformation,
     AirportLive,
     LivePreview,
+    Map,
   } from './index';
 
   const airportLiveVisible = ref(false);
@@ -32,6 +39,11 @@
   };
 </script>
 <style lang="less" scoped>
+  .flightoperation-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
   .flightoperation-top {
     display: flex;
   }
@@ -71,11 +83,11 @@
   .AirportLive {
     position: absolute;
     right: 10px;
-    bottom: 10px;
+    bottom: 20px;
   }
   .LivePreview {
     position: absolute;
     right: 10px;
-    bottom: 10px;
+    bottom: 20px;
   }
 </style>

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

@@ -64,6 +64,9 @@
 </script>
 <style lang="less" scoped>
   .airport-information {
+    position: absolute;
+    top: 50px;
+    left: 0;
     width: 260px;
     padding: 10px 20px;
     margin: 10px 0 0 10px;

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

@@ -56,6 +56,9 @@
   .flightoperation-top {
     display: flex;
     margin-top: 10px;
+    position: absolute;
+    top: 0;
+    left: 0;
   }
   .select-item {
     width: 160px;

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

@@ -108,6 +108,10 @@
 </script>
 <style lang="less" scoped>
   .airport-information {
+    position: absolute;
+    top: 350px;
+    left: 0;
+    z-index: 999;
     width: 260px;
     padding: 10px;
     background: #0d0e15;