From 75e25f89bd1bcfa2eb8208674327caed2790070a Mon Sep 17 00:00:00 2001
From: 胡思旗 <931347610@qq.com>
Date: Mon, 28 Aug 2023 09:26:45 +0800
Subject: [PATCH] 前端环境初步搭建
---
src/components/GMap.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 1a99fcc..e5c8775 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -1,7 +1,9 @@
<template>
<div class="g-map-wrapper">
<!-- 地图区域 -->
- <div id="g-container" :style="{ width: '100%', height: '100%' }" />
+ <div id="g-container" :style="{ width: '100%', height: '100%' }" >
+ <Cesium />
+ </div>
<!-- 绘制面板 -->
<div
class="g-action-panel"
@@ -21,7 +23,7 @@
</div>
</div>
<!-- 飞机OSD -->
- <div v-if="osdVisible.visible && !osdVisible.is_dock" class="osd-panel fz12">
+ <!-- <div v-if="osdVisible.visible && !osdVisible.is_dock" class="osd-panel fz12">
<div class="pl5 pr5 flex-align-center flex-row flex-justify-between" style="border-bottom: 1px solid #515151; height: 18%;">
<span>{{ osdVisible.callsign }}</span>
<span><a class="fz16" style="color: white;" @click="() => osdVisible.visible = false"><CloseOutlined /></a></span>
@@ -139,15 +141,15 @@
{{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }}
</div>
</div>
- </div>
+ </div> -->
<!-- 机场OSD -->
- <div v-if="osdVisible.visible && osdVisible.is_dock" class="osd-panel fz12">
+ <!-- <div v-if="osdVisible.visible && osdVisible.is_dock" class="osd-panel fz12">
<div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between" style="border-bottom: 1px solid #515151; height: 10%;">
<span>{{ osdVisible.gateway_callsign }}</span>
<span><a style="color: white;" @click="() => osdVisible.visible = false"><CloseOutlined /></a></span>
</div>
- <!-- 机场 -->
- <div class ="flex-display" style="border-bottom: 1px solid #515151;">
+ < 机场 -->
+ <!-- <div class ="flex-display" style="border-bottom: 1px solid #515151;">
<div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px; background: #2d2d2d;">
<a-tooltip :title="osdVisible.model">
<div class="flex-column flex-align-center flex-justify-center" style="width: 90%;">
@@ -278,13 +280,13 @@
</a-button>
</a-col>
</a-row>
- <!-- 机场控制面板 -->
- <DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" @close-control-panel="onCloseControlPanel">
- </DockControlPanel>
- </div>
- </div>
+ <!机场控制面板 -->
+ <!-- <DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" @close-control-panel="onCloseControlPanel"> -->
+ <!-- </DockControlPanel> -->
+ <!-- </div> -->
+ <!-- </div> -->
<!-- 飞机-->
- <div class ="flex-display">
+ <!-- <div class ="flex-display">
<div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px; background: #2d2d2d;">
<a-tooltip :title="osdVisible.model">
<div style="width: 90%;" class="flex-column flex-align-center flex-justify-center">
@@ -398,9 +400,9 @@
</a-col>
</a-row>
</div>
- </div>
- <div class="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0" style="border: 1px solid red">
- <div style="background: #535759;" class="width-100"></div>
+ </div> -->
+ <!-- <div class="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0" style="border: 1px solid red"> -->
+ <!-- <div style="background: #535759;" class="width-100"></div>
<div class="capacity-percent" :style="{ width: deviceInfo.device.battery.capacity_percent + '%'}"></div>
<div class="return-home" :style="{ width: deviceInfo.device.battery.return_home_power + '%'}"></div>
<div class="landing" :style="{ width: deviceInfo.device.battery.landing_power + '%'}"></div>
@@ -408,11 +410,11 @@
<div class="battery" :style="{ left: deviceInfo.device.battery.capacity_percent + '%' }">
{{ Math.floor(deviceInfo.device.battery.remain_flight_time / 60) }}:
{{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }}
- </div>
- </div>
+ </div> -->
+ <!-- </div> -->
<!-- 飞行指令 -->
- <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads"></DroneControlPanel>
- </div>
+ <!-- <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads"></DroneControlPanel> -->
+ <!-- </div> -->
</div>
</template>
@@ -423,6 +425,7 @@
generatePointContent,
generatePolyContent
} from '../utils/map-layer-utils'
+import Cesium from './cesiumMap/cesium.vue'
import { postElementsReq } from '/@/api/layer'
import { MapDoodleType, MapElementEnum } from '/@/constants/map'
import { useGMapManage } from '/@/hooks/use-g-map'
@@ -844,7 +847,7 @@
.g-action-panel {
position: absolute;
- top: 16px;
+ top: 32px;
right: 16px;
.g-action-item {
width: 28px;
--
Gitblit v1.9.3