From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/components/GMap.vue | 287 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 158 insertions(+), 129 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 80d540b..e5c8775 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -1,8 +1,12 @@
<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-panle"
+ class="g-action-panel"
:style="{ right: drawVisible ? '316px' : '16px' }"
>
<div :class="state.currentType === 'pin' ? 'g-action-item selection' : 'g-action-item'" @click="draw('pin', true)">
@@ -18,13 +22,14 @@
<a style="color: red;"><CloseOutlined /></a>
</div>
</div>
- <div v-if="osdVisible.visible && !osdVisible.is_dock" class="osd-panel fz12">
+ <!-- 飞机OSD -->
+ <!-- <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>
</div>
<div style="height: 82%;">
- <div class="flex-column flex-align-center flex-justify-center" style="float: left; width: 60px; height: 100%; background: #2d2d2d;">
+ <div class="flex-column flex-align-center flex-justify-center" style="margin-top: -5px; padding-top: 25px; float: left; width: 60px; background: #2d2d2d;">
<a-tooltip :title="osdVisible.model">
<div style="width: 90%;" class="flex-column flex-align-center flex-justify-center">
<span><a-image :src="M30" :preview="false"/></span>
@@ -136,74 +141,82 @@
{{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' : ''}}{{deviceInfo.device.battery.remain_flight_time % 60 }}
</div>
</div>
- </div>
- <div v-if="osdVisible.visible && osdVisible.is_dock" class="osd-panel fz12" style="height: 280px;">
+ </div> -->
+ <!-- 机场OSD -->
+ <!-- <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 style="height: 45%; border-bottom: 1px solid #515151;">
- <div class="flex-column flex-align-center flex-justify-center" style="float: left; width: 60px; height: 100%; background: #2d2d2d;">
+ < 机场 -->
+ <!-- <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%;">
+ <div class="flex-column flex-align-center flex-justify-center" style="width: 90%;">
<span><RobotFilled style="font-size: 48px;"/></span>
<span class="mt10">Dock</span>
</div>
</a-tooltip>
</div>
- <div class="osd">
+ <div class="osd flex-1" style="flex: 1">
<a-row>
- <a-col span="16" :style="deviceInfo.dock.mode_code === EDockModeCode.Disconnected ? 'color: red; font-weight: 700;': 'color: rgb(25,190,107)'">
- {{ EDockModeCode[deviceInfo.dock.mode_code] }}</a-col>
+ <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>
</a-row>
<a-row>
<a-col span="12">
<a-tooltip title="Accumulated Running Time">
<span><HistoryOutlined /></span>
<span class="ml10">
- <span v-if="deviceInfo.dock.acc_time >= 2592000"> {{ Math.floor(deviceInfo.dock.acc_time / 2592000) }}m </span>
- <span v-if="(deviceInfo.dock.acc_time % 2592000) >= 86400"> {{ Math.floor((deviceInfo.dock.acc_time % 2592000) / 86400) }}d </span>
- <span v-if="(deviceInfo.dock.acc_time % 2592000 % 86400) >= 3600"> {{ Math.floor((deviceInfo.dock.acc_time % 2592000 % 86400) / 3600) }}h </span>
- <span v-if="(deviceInfo.dock.acc_time % 2592000 % 86400 % 3600) >= 60"> {{ Math.floor((deviceInfo.dock.acc_time % 2592000 % 86400 % 3600) / 60) }}min </span>
- <span>{{ Math.floor(deviceInfo.dock.acc_time % 2592000 % 86400 % 3600 % 60) }} s</span>
+ <span v-if="deviceInfo.dock.work_osd?.acc_time >= 2592000"> {{ Math.floor(deviceInfo.dock.work_osd?.acc_time / 2592000) }}m </span>
+ <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000) >= 86400"> {{ Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000) / 86400) }}d </span>
+ <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400) >= 3600"> {{ Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400) / 3600) }}h </span>
+ <span v-if="(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600) >= 60"> {{ Math.floor((deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600) / 60) }}min </span>
+ <span>{{ Math.floor(deviceInfo.dock.work_osd?.acc_time % 2592000 % 86400 % 3600 % 60) }} s</span>
</span>
</a-tooltip>
</a-col>
<a-col span="12">
- <a-tooltip title="Last login">
+ <a-tooltip title="Activation time">
<span><FieldTimeOutlined /></span>
- <span class="ml10">{{ new Date(deviceInfo.dock.first_power_on).toLocaleString() }}
+ <span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString() }}
</span>
</a-tooltip>
</a-col>
</a-row>
<a-row>
- <a-col span="12">
+ <a-col span="6">
<a-tooltip title="Network State">
- <span :style="deviceInfo.dock.network_state.quality === 2 ? 'color: #00ee8b' :
- deviceInfo.dock.network_state.quality === 1 ? 'color: yellow' : 'color: red'">
- <span v-if="deviceInfo.dock.network_state.type === 1"><SignalFilled /></span>
+ <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>
<span v-else><GlobalOutlined /></span>
</span>
- <span class="ml10" >{{ deviceInfo.dock.network_state.rate }} KB/S</span>
+ <span class="ml10" >{{ deviceInfo.dock.basic_osd?.network_state?.rate }} kb/s</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="The total number of times the dock has performed missions.">
+ <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">
<span><CloudUploadOutlined class="fz14"/></span>
- <span class="ml10">{{ deviceInfo.dock.media_file_detail?.remain_upload }}</span>
+ <span class="ml10">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip>
<template #title>
- <p>total: {{ deviceInfo.dock.storage.total }}</p>
- <p>used: {{ deviceInfo.dock.storage.used }}</p>
+ <p>total: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
+ <p>used: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
</template>
<span><FolderOpenOutlined /></span>
- <span class="ml10" v-if="deviceInfo.dock.storage.total > 0">
- <a-progress type="circle" :width="20" :percent="deviceInfo.dock.storage.used * 100/ deviceInfo.dock.storage.total"
- :strokeWidth="20" :showInfo="false" :strokeColor="deviceInfo.dock.storage.used * 100 / deviceInfo.dock.storage.total > 80 ? 'red' : '#00ee8b' "/>
+ <span class="ml10" v-if="deviceInfo.dock.basic_osd?.storage?.total > 0">
+ <a-progress type="circle" :width="20" :percent="deviceInfo.dock.basic_osd?.storage?.used * 100/ deviceInfo.dock.basic_osd?.storage?.total"
+ :strokeWidth="20" :showInfo="false" :strokeColor="deviceInfo.dock.basic_osd?.storage?.used * 100 / deviceInfo.dock.basic_osd?.storage?.total > 80 ? 'red' : '#00ee8b' "/>
</span>
</a-tooltip>
</a-col>
@@ -212,58 +225,69 @@
<a-col span="6">
<a-tooltip title="Wind Speed">
<span>W.S</span>
- <span class="ml10">{{ deviceInfo.dock.wind_speed === str ? str : (deviceInfo.dock.wind_speed / 10).toFixed(2) + ' m/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">
<span>🌧</span>
- <span class="ml10">{{ deviceInfo.dock.rainfall === str ? str : deviceInfo.dock.rainfall + ' mm/h' }}</span>
+ <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip title="Environment Temperature">
<span>°C</span>
- <span class="ml10">{{ deviceInfo.dock.environment_temperature }}</span>
+ <span class="ml10">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
- <a-tooltip title="Environment Humidity">
- <span>💦</span>
- <span class="ml10">{{ deviceInfo.dock.environment_humidity === str ? str : deviceInfo.dock.environment_humidity }}</span>
+ <a-tooltip title="Dock Temperature">
+ <span>°C</span>
+ <span class="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
</a-tooltip>
</a-col>
</a-row>
<a-row>
- <a-col span="6">
- <a-tooltip title="Dock Temperature">
- <span>°C</span>
- <span class="ml10">{{ deviceInfo.dock.temperature }}</span>
- </a-tooltip>
- </a-col>
<a-col span="6">
<a-tooltip title="Dock Humidity">
<span>💦</span>
- <span class="ml10">{{ deviceInfo.dock.humidity === str ? str : deviceInfo.dock.humidity }}</span>
+ <span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip title="Working Voltage">
<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.working_voltage === str ? str : deviceInfo.dock.working_voltage + ' mV' }}</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">
<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.working_current === str ? str : deviceInfo.dock.working_current + ' mA' }}</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">
+ <span><RocketOutlined /></span>
+ <span class="ml10">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
</a-tooltip>
</a-col>
</a-row>
- </div>
- </div>
- <div style="height: 45%;">
- <div class="flex-column flex-align-center flex-justify-center" style="float: left; width: 60px; height: 100%; background: #2d2d2d;">
+ <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> -->
+ <!-- 飞机-->
+ <!-- <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">
<span><a-image :src="M30" :preview="false"/></span>
@@ -271,7 +295,7 @@
</div>
</a-tooltip>
</div>
- <div class="osd">
+ <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>
@@ -280,19 +304,32 @@
<a-col span="6">
<a-tooltip title="Upward Quality">
<span><SignalFilled /><ArrowUpOutlined style="font-size: 9px; vertical-align: top;" /></span>
- <span class="ml10">{{ deviceInfo.dock.sdr?.up_quality }}</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">
<span><SignalFilled /><ArrowDownOutlined style="font-size: 9px; vertical-align: top;" /></span>
- <span class="ml10">{{ deviceInfo.dock.sdr?.down_quality }}</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">
<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>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip>
+ <template #title>
+ <p>total: {{ deviceInfo.device?.storage?.total }}</p>
+ <p>used: {{ deviceInfo.device?.storage?.used }}</p>
+ </template>
+ <span><FolderOpenOutlined /></span>
+ <span class="ml10" v-if="deviceInfo.device?.storage?.total > 0">
+ <a-progress type="circle" :width="20" :percent="deviceInfo.device?.storage?.used * 100/ deviceInfo.device?.storage?.total"
+ :strokeWidth="20" :showInfo="false" :strokeColor="deviceInfo.device?.storage?.used * 100 / deviceInfo.device?.storage?.total > 80 ? 'red' : '#00ee8b' "/>
+ </span>
</a-tooltip>
</a-col>
</a-row>
@@ -363,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>
@@ -373,10 +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> -->
+ <!-- </div> -->
+ <!-- 飞行指令 -->
+ <!-- <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads"></DroneControlPanel> -->
+ <!-- </div> -->
</div>
</template>
@@ -387,12 +425,13 @@
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'
import { useGMapCover } from '/@/hooks/use-g-map-cover'
import { useMouseTool } from '/@/hooks/use-mouse-tool'
-import { getApp } from '/@/root'
+import { getApp, getRoot } from '/@/root'
import { useMyStore } from '/@/store'
import { GeojsonCoordinate } from '/@/types/map'
import { MapDoodleEnum } from '/@/types/map-enum'
@@ -400,15 +439,22 @@
import { uuidv4 } from '/@/utils/uuid'
import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
import { deviceTsaUpdate } from '/@/hooks/use-g-map-tsa'
-import { DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode } from '/@/types/device'
+import {
+ DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode,
+ NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
+} from '/@/types/device'
import pin from '/@/assets/icons/pin-2d8cf0.svg'
import M30 from '/@/assets/icons/m30.png'
import {
BorderOutlined, LineOutlined, CloseOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined,
- ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined,
- FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined
+ ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined, RocketOutlined,
+ FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined
} from '@ant-design/icons-vue'
import { EDeviceTypeName } from '../types'
+import DockControlPanel from './g-map/DockControlPanel.vue'
+import { useDockControl } from './g-map/use-dock-control'
+import DroneControlPanel from './g-map/DroneControlPanel.vue'
+import { useConnectMqtt } from './g-map/use-connect-mqtt'
export default defineComponent({
components: {
@@ -428,14 +474,19 @@
FolderOpenOutlined,
RobotFilled,
ArrowUpOutlined,
- ArrowDownOutlined
+ ArrowDownOutlined,
+ DockControlPanel,
+ DroneControlPanel,
+ CarryOutOutlined,
+ RocketOutlined
},
name: 'GMap',
props: {},
setup () {
const useMouseToolHook = useMouseTool()
const useGMapManageHook = useGMapManage()
- const deviceTsaUpdateHook = ref()
+ const deviceTsaUpdateHook = deviceTsaUpdate()
+ const root = getRoot()
const mouseMode = ref(false)
const store = useMyStore()
@@ -450,52 +501,6 @@
transmission_signal_quality: str,
} as GatewayOsd,
dock: {
- media_file_detail: {
- remain_upload: 0
- },
- sdr: {
- up_quality: str,
- down_quality: str,
- frequency_band: -1,
- },
- network_state: {
- type: 0,
- quality: 0,
- rate: 0,
- },
- drone_in_dock: 0,
- drone_charge_state: {
- state: 0,
- capacity_percent: str,
- },
- rainfall: str,
- wind_speed: str,
- environment_temperature: str,
- environment_humidity: str,
- temperature: str,
- humidity: str,
- job_number: 0,
- acc_time: 0,
- first_power_on: 0,
- positionState: {
- gps_number: str,
- is_fixed: 0,
- rtk_number: str,
- is_calibration: 0,
- quality: 0,
- },
- storage: {
- total: 0,
- used: 0,
- },
- electric_supply_voltage: 0,
- working_voltage: str,
- working_current: str,
- backup_battery_voltage: 0,
- mode_code: -1,
- cover_state: -1,
- supplement_light_state: -1,
- putter_state: -1,
} as DockOsd,
device: {
@@ -538,13 +543,12 @@
watch(() => store.state.deviceStatusEvent,
data => {
- deviceTsaUpdateHook.value = deviceTsaUpdate()
if (Object.keys(data.deviceOnline).length !== 0) {
- deviceTsaUpdateHook.value.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
+ deviceTsaUpdateHook.initMarker(data.deviceOnline.domain, data.deviceOnline.device_callsign, data.deviceOnline.sn)
store.state.deviceStatusEvent.deviceOnline = {} as DeviceStatus
}
if (Object.keys(data.deviceOffline).length !== 0) {
- deviceTsaUpdateHook.value.removeMarker(data.deviceOffline.sn)
+ deviceTsaUpdateHook.removeMarker(data.deviceOffline.sn)
if ((data.deviceOffline.sn === osdVisible.value.sn) || (osdVisible.value.is_dock && data.deviceOffline.sn === osdVisible.value.gateway_sn)) {
osdVisible.value.visible = false
store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
@@ -558,25 +562,23 @@
)
watch(() => store.state.deviceState, data => {
- if (!deviceTsaUpdateHook.value) {
- deviceTsaUpdateHook.value = deviceTsaUpdate()
- }
if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
- deviceTsaUpdateHook.value.moveTo(data.currentSn, data.gatewayInfo[data.currentSn].longitude, data.gatewayInfo[data.currentSn].latitude)
+ deviceTsaUpdateHook.moveTo(data.currentSn, data.gatewayInfo[data.currentSn].longitude, data.gatewayInfo[data.currentSn].latitude)
if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
deviceInfo.gateway = data.gatewayInfo[osdVisible.value.gateway_sn]
}
}
if (data.currentType === EDeviceTypeName.Aircraft && data.deviceInfo[data.currentSn]) {
- deviceTsaUpdateHook.value.moveTo(data.currentSn, data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude)
+ deviceTsaUpdateHook.moveTo(data.currentSn, data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude)
if (osdVisible.value.visible && osdVisible.value.sn !== '') {
deviceInfo.device = data.deviceInfo[osdVisible.value.sn]
}
}
if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
+ deviceTsaUpdateHook.initMarker(EDeviceTypeName.Dock, [EDeviceTypeName.Dock], data.currentSn, data.dockInfo[data.currentSn].basic_osd?.longitude, data.dockInfo[data.currentSn].basic_osd?.latitude)
if (osdVisible.value.visible && osdVisible.value.is_dock && osdVisible.value.gateway_sn !== '') {
deviceInfo.dock = data.dockInfo[osdVisible.value.gateway_sn]
- deviceInfo.device = data.deviceInfo[deviceInfo.dock.sub_device?.device_sn]
+ deviceInfo.device = data.deviceInfo[deviceInfo.dock.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
}
}
}, {
@@ -642,10 +644,22 @@
useMouseToolHook.mouseTool(type, getDrawCallback)
mouseMode.value = bool
}
+
+ // dock 控制面板
+ const {
+ dockControlPanelVisible,
+ setDockControlPanelVisible,
+ onCloseControlPanel,
+ } = useDockControl()
+
+ // 连接或断开drc
+ useConnectMqtt()
+
onMounted(() => {
const app = getApp()
useGMapManageHook.globalPropertiesConfig(app)
})
+
function getDrawCallback ({ obj }) {
switch (state.currentType) {
case MapDoodleEnum.PIN:
@@ -813,18 +827,27 @@
EModeCode,
str,
EDockModeCode,
+ dockControlPanelVisible,
+ setDockControlPanelVisible,
+ onCloseControlPanel,
+ NetworkStateTypeEnum,
+ NetworkStateQualityEnum,
+ RainfallEnum,
+ DroneInDockEnum
}
}
})
</script>
<style lang="scss" scoped>
+
.g-map-wrapper {
height: 100%;
width: 100%;
- .g-action-panle {
+
+ .g-action-panel {
position: absolute;
- top: 16px;
+ top: 32px;
right: 16px;
.g-action-item {
width: 28px;
@@ -845,20 +868,26 @@
border: 1px solid $primary;
border-radius: 2px;
}
+
+ // antd button 光晕
+ &:deep(.ant-btn){
+ &::after {
+ display: none;
+ }
+ }
}
.osd-panel {
position: absolute;
- left: 350px;
+ left: 10px;
top: 10px;
width: 480px;
- height: 160px;
- background: black;
- color: white;
+ background: #000;
+ color: #fff;
border-radius: 2px;
- opacity: 0.7;
+ opacity: 0.8;
}
-.osd > div {
- padding-top: 5px;
+.osd > div:not(.dock-control-panel) {
+ margin-top: 5px;
padding-left: 5px;
}
--
Gitblit v1.9.3