From aad9909103473de08732b25c61c28e02f9835c9c Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Thu, 14 Sep 2023 22:45:14 +0800
Subject: [PATCH] 地图线上环境不显示问题更新
---
src/components/GMap.vue | 134 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index e5c8775..1b00302 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -1,9 +1,7 @@
<template>
<div class="g-map-wrapper">
<!-- 地图区域 -->
- <div id="g-container" :style="{ width: '100%', height: '100%' }" >
- <Cesium />
- </div>
+ <div id="g-container" :style="{ width: '100%', height: '100%' }" />
<!-- 绘制面板 -->
<div
class="g-action-panel"
@@ -23,7 +21,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>
@@ -39,7 +37,7 @@
</div>
<div class="osd">
<a-row>
- <a-col span="16" :style="deviceInfo.device.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;': 'color: rgb(25,190,107)'">{{ EModeCode[deviceInfo.device.mode_code] }}</a-col>
+ <a-col span="16" :style="deviceInfo.device.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;': 'color: rgb(25,190,107)'">{{ EModeText[deviceInfo.device.mode_code] }}</a-col>
</a-row>
<a-row>
<a-col span="6">
@@ -56,14 +54,14 @@
</a-col>
<a-col span="6">
- <a-tooltip title="Drone Battery Level">
+ <a-tooltip title="无人机电池电量">
<span><ThunderboltOutlined class="fz14"/></span>
<span class="ml10">{{ deviceInfo.device.battery.capacity_percent !== str ? deviceInfo.device.battery.capacity_percent + ' %' : deviceInfo.device.battery.capacity_percent }}</span>
</a-tooltip>
</a-col>
</a-row>
<a-row>
- <a-tooltip title="RTK Fixed">
+ <a-tooltip title="RTK固定">
<a-col span="6" class="flex-row flex-align-center flex-justify-start">
<span>Fixed</span>
<span class="ml10 circle" :style="deviceInfo.device.position_state.is_fixed === 1 ? 'backgroud: rgb(25,190,107);' : ' background: red;'"></span>
@@ -84,25 +82,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Flight Mode">
+ <a-tooltip title="飞行模式">
<span><ControlOutlined class="fz16" /></span>
<span class="ml10">{{ EGear[deviceInfo.device.gear] }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Altitude above sea level">
+ <a-tooltip title="海拔高度">
<span>ASL</span>
<span class="ml10">{{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + ' m'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Altitude above takeoff level">
+ <a-tooltip title="高于起飞高度">
<span>ALT</span>
<span class="ml10">{{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) + ' m' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Distance to Home Point">
+ <a-tooltip title="到起点距离">
<span>H</span>
<span class="ml10">{{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m' }}</span>
</a-tooltip>
@@ -110,19 +108,19 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Horizontal Speed">
+ <a-tooltip title="水平速度">
<span>H.S</span>
<span class="ml10">{{ deviceInfo.device.horizontal_speed === str ? str : deviceInfo.device.horizontal_speed.toFixed(2) + ' m/s'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Vertical Speed">
+ <a-tooltip title="垂直速度">
<span>V.S</span>
<span class="ml10">{{ deviceInfo.device.vertical_speed === str ? str : deviceInfo.device.vertical_speed.toFixed(2) + ' m/s'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Wind Speed">
+ <a-tooltip title="风速">
<span>W.S</span>
<span class="ml10">{{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed / 10).toFixed(2) + ' m/s'}}</span>
</a-tooltip>
@@ -141,15 +139,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%;">
@@ -161,11 +159,11 @@
<div class="osd flex-1" style="flex: 1">
<a-row>
<a-col span="16" :style="deviceInfo.dock.basic_osd?.mode_code === EDockModeCode.Disconnected ? 'color: red; font-weight: 700;': 'color: rgb(25,190,107)'">
- {{ EDockModeCode[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
+ {{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
</a-row>
<a-row>
<a-col span="12">
- <a-tooltip title="Accumulated Running Time">
+ <a-tooltip title="累计运行时间">
<span><HistoryOutlined /></span>
<span class="ml10">
<span v-if="deviceInfo.dock.work_osd?.acc_time >= 2592000"> {{ Math.floor(deviceInfo.dock.work_osd?.acc_time / 2592000) }}m </span>
@@ -177,7 +175,7 @@
</a-tooltip>
</a-col>
<a-col span="12">
- <a-tooltip title="Activation time">
+ <a-tooltip title="激活时间">
<span><FieldTimeOutlined /></span>
<span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString() }}
</span>
@@ -186,7 +184,7 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Network State">
+ <a-tooltip title="网络状态">
<span :style="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.ETHERNET || deviceInfo.dock.basic_osd?.network_state?.quality === NetworkStateQualityEnum.GOOD ?
'color: #00ee8b' : deviceInfo.dock.basic_osd?.network_state?.quality === NetworkStateQualityEnum.MEDIUM ? 'color: yellow' : 'color: red'">
<span v-if="deviceInfo.dock.basic_osd?.network_state?.type === NetworkStateTypeEnum.FOUR_G"><SignalFilled /></span>
@@ -196,13 +194,13 @@
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="The total number of times the dock has performed missions.">
+ <a-tooltip title="设备执行任务总次数">
<span><CarryOutOutlined /></span>
<span class="ml10" >{{ deviceInfo.dock.work_osd?.job_number }} </span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Media File Remain Upload">
+ <a-tooltip title="媒体文件剩余上传">
<span><CloudUploadOutlined class="fz14"/></span>
<span class="ml10">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
</a-tooltip>
@@ -210,8 +208,8 @@
<a-col span="6">
<a-tooltip>
<template #title>
- <p>total: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
- <p>used: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
+ <p>总共: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
+ <p>已使用: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
</template>
<span><FolderOpenOutlined /></span>
<span class="ml10" v-if="deviceInfo.dock.basic_osd?.storage?.total > 0">
@@ -223,25 +221,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Wind Speed">
+ <a-tooltip title="风速">
<span>W.S</span>
<span class="ml10">{{ (deviceInfo.dock.basic_osd?.wind_speed ?? str) + ' m/s'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Rainfall">
+ <a-tooltip title="降雨量">
<span>🌧</span>
- <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
+ <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.降雨量] }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Environment Temperature">
+ <a-tooltip title="环境温度">
<span>°C</span>
<span class="ml10">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Dock Temperature">
+ <a-tooltip title="设备温度">
<span>°C</span>
<span class="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
</a-tooltip>
@@ -249,25 +247,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Dock Humidity">
+ <a-tooltip title="设备湿度">
<span>💦</span>
<span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Working Voltage">
+ <a-tooltip title="工作电压">
<span style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 16px; text-align: center; float: left;">V</span>
<span class="ml10">{{ (deviceInfo.dock.work_osd?.working_voltage ?? str) + ' mV' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Working Current">
+ <a-tooltip title="工作电流">
<span style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 15px; text-align: center; float: left;" >A</span>
<span class="ml10">{{ (deviceInfo.dock.work_osd?.working_current ?? str) + ' mA' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Drone in dock">
+ <a-tooltip title="设备上的无人机">
<span><RocketOutlined /></span>
<span class="ml10">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
</a-tooltip>
@@ -276,17 +274,17 @@
<a-row class="p5">
<a-col span="24">
<a-button type="primary" :disabled="dockControlPanelVisible" size="small" @click="setDockControlPanelVisible(true)">
- Actions
+ 操作
</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">
@@ -298,23 +296,23 @@
<div class="osd flex-1">
<a-row>
<a-col span="16" :style="!deviceInfo.device || deviceInfo.device?.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;': 'color: rgb(25,190,107)'">
- {{ !deviceInfo.device ? EModeCode[EModeCode.Disconnected] : EModeCode[deviceInfo.device?.mode_code] }}</a-col>
+ {{ !deviceInfo.device ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code] }}</a-col>
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Upward Quality">
+ <a-tooltip title="向上质量">
<span><SignalFilled /><ArrowUpOutlined style="font-size: 9px; vertical-align: top;" /></span>
<span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.up_quality }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Downward Quality">
+ <a-tooltip title="向下质量">
<span><SignalFilled /><ArrowDownOutlined style="font-size: 9px; vertical-align: top;" /></span>
<span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.down_quality }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Drone Battery Level">
+ <a-tooltip title="无人机电池电量">
<span><ThunderboltOutlined class="fz14"/></span>
<span class="ml10">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ? deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
</a-tooltip>
@@ -322,8 +320,8 @@
<a-col span="6">
<a-tooltip>
<template #title>
- <p>total: {{ deviceInfo.device?.storage?.total }}</p>
- <p>used: {{ deviceInfo.device?.storage?.used }}</p>
+ <p>总供: {{ deviceInfo.device?.storage?.total }}</p>
+ <p>已使用: {{ deviceInfo.device?.storage?.used }}</p>
</template>
<span><FolderOpenOutlined /></span>
<span class="ml10" v-if="deviceInfo.device?.storage?.total > 0">
@@ -334,7 +332,7 @@
</a-col>
</a-row>
<a-row>
- <a-tooltip title="RTK Fixed">
+ <a-tooltip title="RTK固定">
<a-col span="6" class="flex-row flex-align-center flex-justify-start">
<span>Fixed</span>
<span class="ml10 circle" :style="deviceInfo.device?.position_state.is_fixed === 1 ? 'backgroud: rgb(25,190,107);' : ' background: red;'"></span>
@@ -355,25 +353,25 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Flight Mode">
+ <a-tooltip title="飞行模式">
<span><ControlOutlined class="fz16" /></span>
<span class="ml10">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Altitude above sea level">
+ <a-tooltip title="海拔高度">
<span>ASL</span>
<span class="ml10">{{ !deviceInfo.device || deviceInfo.device.height === str ? str : deviceInfo.device?.height.toFixed(2) + ' m'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Altitude above takeoff level">
+ <a-tooltip title="高于起飞高度">
<span>ALT</span>
<span class="ml10">{{ !deviceInfo.device || deviceInfo.device.elevation === str ? str : deviceInfo.device?.elevation.toFixed(2) + ' m' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Distance to Home Point">
+ <a-tooltip title="到起点距离">
<span style="border: 1px solid; border-radius: 50%; width: 18px; height: 18px; line-height: 15px; text-align: center; display: block; float: left;" >H</span>
<span class="ml10">{{ !deviceInfo.device || deviceInfo.device.home_distance === str ? str : deviceInfo.device?.home_distance.toFixed(2) + ' m' }}</span>
</a-tooltip>
@@ -381,28 +379,28 @@
</a-row>
<a-row>
<a-col span="6">
- <a-tooltip title="Horizontal Speed">
+ <a-tooltip title="水平速度">
<span>H.S</span>
<span class="ml10">{{ !deviceInfo.device || deviceInfo.device?.horizontal_speed === str ? str : deviceInfo.device?.horizontal_speed.toFixed(2) + ' m/s'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Vertical Speed">
+ <a-tooltip title="垂直速度">
<span>V.S</span>
<span class="ml10">{{ !deviceInfo.device || deviceInfo.device.vertical_speed === str ? str : deviceInfo.device?.vertical_speed.toFixed(2) + ' m/s'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Wind Speed">
+ <a-tooltip title="风速">
<span>W.S</span>
<span class="ml10">{{ !deviceInfo.device || deviceInfo.device.wind_speed === str ? str : (deviceInfo.device?.wind_speed / 10).toFixed(2) + ' m/s'}}</span>
</a-tooltip>
</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>
@@ -410,11 +408,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>
@@ -425,7 +423,6 @@
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'
@@ -440,7 +437,7 @@
import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
import { deviceTsaUpdate } from '/@/hooks/use-g-map-tsa'
import {
- DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode,
+ DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode, EDockModeText, EModeText,
NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
} from '/@/types/device'
import pin from '/@/assets/icons/pin-2d8cf0.svg'
@@ -655,7 +652,8 @@
// 连接或断开drc
useConnectMqtt()
- onMounted(() => {
+ onMounted(async () => {
+ await nextTick()
const app = getApp()
useGMapManageHook.globalPropertiesConfig(app)
})
@@ -827,6 +825,8 @@
EModeCode,
str,
EDockModeCode,
+ EDockModeText,
+ EModeText,
dockControlPanelVisible,
setDockControlPanelVisible,
onCloseControlPanel,
@@ -847,7 +847,7 @@
.g-action-panel {
position: absolute;
- top: 32px;
+ top: 16px;
right: 16px;
.g-action-item {
width: 28px;
--
Gitblit v1.9.3