From 1ef360a14efab8a1defa1dfdc13bb5af64a9d621 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 18 Sep 2023 17:02:51 +0800
Subject: [PATCH] 飞行指令打开
---
src/components/GMap.vue | 1278 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 796 insertions(+), 482 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 788011c..ece0f70 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -54,7 +54,7 @@
<a-col span="6">
<a-tooltip title="Signal strength">
<span>HD</span>
- <span class="ml10">{{ deviceInfo.gateway?.transmission_signal_quality }}</span>
+ <span class="ml5">{{ deviceInfo.gateway?.transmission_signal_quality }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -62,7 +62,7 @@
<span>
<ThunderboltOutlined class="fz14" />
</span>
- <span class="ml10">{{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ?
+ <span class="ml5">{{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ?
deviceInfo.gateway.capacity_percent + ' %' : deviceInfo.gateway.capacity_percent }}</span>
</a-tooltip>
</a-col>
@@ -72,7 +72,7 @@
<span>
<ThunderboltOutlined class="fz14" />
</span>
- <span class="ml10">{{ deviceInfo.device.battery.capacity_percent !== str ?
+ <span class="ml5">{{ deviceInfo.device.battery.capacity_percent !== str ?
deviceInfo.device.battery.capacity_percent + ' %' : deviceInfo.device.battery.capacity_percent }}</span>
</a-tooltip>
</a-col>
@@ -81,14 +81,14 @@
<a-tooltip title="RTK固定">
<a-col span="6" class="flex-row flex-align-center flex-justify-start">
<span>Fixed</span>
- <span class="ml10 circle"
+ <span class="ml5 circle"
:style="deviceInfo.device.position_state.is_fixed === 1 ? 'backgroud: rgb(25,190,107);' : ' background: red;'"></span>
</a-col>
</a-tooltip>
<a-col span="6">
<a-tooltip title="GPS">
<span>GPS</span>
- <span class="ml10">{{ deviceInfo.device.position_state.gps_number }}</span>
+ <span class="ml5">{{ deviceInfo.device.position_state.gps_number }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -96,7 +96,7 @@
<span>
<TrademarkOutlined class="fz14" />
</span>
- <span class="ml10">{{ deviceInfo.device.position_state.rtk_number }}</span>
+ <span class="ml5">{{ deviceInfo.device.position_state.rtk_number }}</span>
</a-tooltip>
</a-col>
</a-row>
@@ -106,25 +106,25 @@
<span>
<ControlOutlined class="fz16" />
</span>
- <span class="ml10">{{ EGear[deviceInfo.device.gear] }}</span>
+ <span class="ml5">{{ EGear[deviceInfo.device.gear] }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip title="海拔高度">
<span>ASL</span>
- <span class="ml10">{{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + 'm'}}</span>
+ <span class="ml5">{{ deviceInfo.device.height === str ? str : deviceInfo.device.height.toFixed(2) + ' m'}}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip title="高于起飞高度">
<span>ALT</span>
- <span class="ml10">{{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) +' m' }}</span>
+ <span class="ml5">{{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) +' m' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip title="到起点距离">
<span>H</span>
- <span class="ml10">{{ deviceInfo.device.home_distance === str ? str :
+ <span class="ml5">{{ deviceInfo.device.home_distance === str ? str :
deviceInfo.device.home_distance.toFixed(2) + ' m' }}</span>
</a-tooltip>
</a-col>
@@ -133,21 +133,21 @@
<a-col span="6">
<a-tooltip title="水平速度">
<span>H.S</span>
- <span class="ml10">{{ deviceInfo.device.horizontal_speed === str ? str :
+ <span class="ml5">{{ 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="垂直速度">
<span>V.S</span>
- <span class="ml10">{{ deviceInfo.device.vertical_speed === str ? str :
+ <span class="ml5">{{ 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="风速">
<span>W.S</span>
- <span class="ml10">{{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed /
+ <span class="ml5">{{ deviceInfo.device.wind_speed === str ? str : (deviceInfo.device.wind_speed /
10).toFixed(2) + ' m/s' }}</span>
</a-tooltip>
</a-col>
@@ -168,7 +168,7 @@
</div>
</div>
<!-- 机场OSD -->
- <div v-if="osdVisible.visible && osdVisible.is_dock" class="osd-panel fz12">
+ <div class="osd-panel fz12" v-if="osdVisible.visible && osdVisible.is_dock">
<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>
@@ -189,150 +189,176 @@
</a-tooltip>
</div>
<div class="osd flex-1" style="flex: 1">
- <a-row>
- <a-col span="16"
+ <a-row justify="space-between" class="mr-20">
+ <a-col span="9"
:style="deviceInfo.dock.basic_osd?.mode_code === EDockModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
{{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
- </a-row>
- <a-row>
- <a-col span="12">
- <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>
- <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="激活时间">
- <span>
- <FieldTimeOutlined />
- </span>
- <span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString()
- }}
- </span>
- </a-tooltip>
+ <!-- <a-col span="1">{{ hmsInfo[sn]?.length || 1 }}</a-col> -->
+ <a-col span="1" class="num" v-if="hmsInfo[sn]">{{ hmsInfo[sn]?.length }}</a-col>
+ <a-col span="14" v-if="hmsInfo[sn] && hmsInfo[sn].length>0" style="width: 100%;padding-left:5px ;">
+ <a-tooltip :title="hmsInfo[sn][0].message_zh">
+ <div class="overflow">{{ hmsInfo[sn][0].message_zh }}</div>
+ </a-tooltip>
</a-col>
</a-row>
<a-row>
- <a-col span="6">
- <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 />
+ <!-- <a-col span="12">
+ <a-tooltip title="累计运行时间">
+ <span><HistoryOutlined /></span>
+ <span class="ml5">
+ <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>
- <span v-else>
- <GlobalOutlined />
- </span>
- </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="设备执行任务总次数">
- <span>
- <CarryOutOutlined />
- </span>
- <span class="ml10">{{ deviceInfo.dock.work_osd?.job_number }} </span>
- </a-tooltip>
- </a-col>
- <a-col span="6">
- <a-tooltip title="媒体文件剩余上传">
- <span>
- <CloudUploadOutlined class="fz14" />
- </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>总共: {{ 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">
- <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>
- </a-row>
- <a-row>
- <a-col span="6">
- <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>
+ </a-col> -->
+ <a-col span="9">
<a-tooltip title="降雨量">
<span>🌧</span>
- <span class="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
+ <span class="ml5">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
</a-tooltip>
</a-col>
- <a-col span="6">
- <a-tooltip title="环境温度">
- <span>°C</span>
- <span class="ml10">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
- </a-tooltip>
+ <a-col span="15" style="width: 100%;">
+ <div class="env-box span5">
+ <div class="span-box mr-20">
+ <a-tooltip title="环境温度">
+ <span>°C</span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
+ </a-tooltip>
+ </div>
+ <div class="span-box mr-20">
+ <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>
+ <span v-else>
+ <GlobalOutlined />
+ </span>
+ </span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.network_state?.rate }} kb/s</span>
+ </a-tooltip>
+ </div>
+ <div class="span-box mr-20">
+ <a-tooltip title="媒体文件剩余上传">
+ <span>
+ <CloudUploadOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
+ </a-tooltip>
+ </div>
+ </div>
</a-col>
- <a-col span="6">
- <a-tooltip title="设备温度">
- <span>°C</span>
- <span class="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
- </a-tooltip>
- </a-col>
+ <!-- <a-col span="12">
+ <a-tooltip title="激活时间">
+ <span><FieldTimeOutlined /></span>
+ <span class="ml5">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString() }}
+ </span>
+ </a-tooltip>
+ </a-col> -->
</a-row>
- <a-row>
- <a-col span="6">
- <a-tooltip title="设备湿度">
- <span>💦</span>
- <span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
- </a-tooltip>
+ <!-- 注释 -->
+ <!-- <a-row>
+ <a-col span="6">
+ <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>
+ <span v-else><GlobalOutlined /></span>
+ </span>
+ <span class="ml5" >{{ deviceInfo.dock.basic_osd?.network_state?.rate }} kb/s</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="设备执行任务总次数">
+ <span><CarryOutOutlined /></span>
+ <span class="ml5" >{{ deviceInfo.dock.work_osd?.job_number }} </span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="媒体文件剩余上传">
+ <span><CloudUploadOutlined class="fz14"/></span>
+ <span class="ml5">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip>
+ <template #title>
+ <p>总共: {{ deviceInfo.dock.basic_osd?.storage?.total }}</p>
+ <p>已使用: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
+ </template>
+ <span><FolderOpenOutlined /></span>
+ <span class="ml5" 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>
+ </a-row>
+ <a-row>
+ <a-col span="6">
+ <a-tooltip title="风速">
+ <span>W.S</span>
+ <span class="ml5">{{ (deviceInfo.dock.basic_osd?.wind_speed ?? str) + ' m/s'}}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="降雨量">
+ <span>🌧</span>
+ <span class="ml5">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="环境温度">
+ <span>°C</span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.environment_temperature }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="设备温度">
+ <span>°C</span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col span="6">
+ <a-tooltip title="设备湿度">
+ <span>💦</span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.humidity }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <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="ml5">{{ (deviceInfo.dock.work_osd?.working_voltage ?? str) + ' mV' }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <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="ml5">{{ (deviceInfo.dock.work_osd?.working_current ?? str) + ' mA' }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="设备上的无人机">
+ <span><RocketOutlined /></span>
+ <span class="ml5">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row> -->
+ <a-row class="p5" justify="space-between">
+ <a-col span="11">
+ <a-button :class="[showMonitor?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openMonitor">
+ 监控
+ </a-button>
</a-col>
- <a-col span="6">
- <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="工作电流">
- <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="设备上的无人机">
- <span>
- <RocketOutlined />
- </span>
- <span class="ml10">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
- </a-tooltip>
- </a-col>
- </a-row>
- <a-row class="p5">
- <a-col span="24">
- <a-button type="primary" :disabled="dockControlPanelVisible" size="small"
+ <a-col span="11">
+ <a-button :class="[showOption?'active-color':'unactive-color']" class="width-100" type="primary" :disabled="dockControlPanelVisible" size="small"
@click="setDockControlPanelVisible(true)">
操作
</a-button>
@@ -344,6 +370,11 @@
</DockControlPanel>
</div>
</div>
+ <a-row class="p5" v-if="showMonitor">
+ <!-- <a-spin :spinning="spinning"> -->
+ <Jessibuca v-if="airPortUrl" :videoUrl="airPortUrl" width="100%" height="300px" />
+ <!-- </a-spin> -->
+ </a-row>
<!-- 飞机-->
<div class="flex-display">
<div class="flex-column flex-align-stretch flex-justify-center" style="width: 60px; background: #2d2d2d;">
@@ -355,20 +386,37 @@
</a-tooltip>
</div>
<div class="osd flex-1">
- <a-row>
- <a-col span="16"
+ <a-row class="mr-20" align="middle">
+ <a-col span="9"
:style="!deviceInfo.device || deviceInfo.device?.mode_code === EModeCode.Disconnected ? 'color: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
{{ !deviceInfo.device ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code]
}}</a-col>
+ <a-col span="15">
+ <a-select :showArrow="false" :bordered="false" :placeholder="EModeCode.Disconnected==14?'N/A':'请选择'" :disabled="EModeCode.Disconnected==14?true:false" size="small" style="width:100%;background-color: #5d5f61;color: #fff;"></a-select>
+ </a-col>
</a-row>
- <a-row>
+ <a-row align="middle" justify="center">
+ <a-col span="24"> <div style="color:#494949;" class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div> </a-col>
+ </a-row>
+ <a-row align="middle" justify="center">
+ <a-col span="24">
+ <a-button :class="[showFly?'active-color':'unactive-color']" class="width-100" type="primary" size="small">
+ 飞行控制
+ </a-button>
+ </a-col>
+ </a-row>
+ </div>
+ </div>
+ <!-- 飞机图标信息 -->
+ <div class="osd-info flex-1">
+ <!-- <a-row align="middle">
<a-col span="6">
<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>
+ <span class="ml5">{{ deviceInfo.dock.link_osd?.sdr?.up_quality }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -377,7 +425,7 @@
<SignalFilled />
<ArrowDownOutlined style="font-size: 9px; vertical-align: top;" />
</span>
- <span class="ml10">{{ deviceInfo.dock.link_osd?.sdr?.down_quality }}</span>
+ <span class="ml5">{{ deviceInfo.dock.link_osd?.sdr?.down_quality }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -385,7 +433,7 @@
<span>
<ThunderboltOutlined class="fz14" />
</span>
- <span class="ml10">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ?
+ <span class="ml5">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ?
deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
</a-tooltip>
</a-col>
@@ -398,7 +446,7 @@
<span>
<FolderOpenOutlined />
</span>
- <span class="ml10" v-if="deviceInfo.device?.storage?.total > 0">
+ <span class="ml5" 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"
@@ -411,14 +459,14 @@
<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>
+ <span class="ml5 circle"
+ :style="deviceInfo.device?.position_state.is_fixed === 1 ? 'backgroud: rgb(25,190,107);' : 'background: red;'"></span>
</a-col>
</a-tooltip>
<a-col span="6">
<a-tooltip title="GPS">
<span>GPS</span>
- <span class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.gps_number : str }}</span>
+ <span class="ml5">{{ deviceInfo.device ? deviceInfo.device.position_state.gps_number : str }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -426,7 +474,7 @@
<span>
<TrademarkOutlined class="fz14" />
</span>
- <span class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
+ <span class="ml5">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
</a-tooltip>
</a-col>
</a-row>
@@ -436,20 +484,20 @@
<span>
<ControlOutlined class="fz16" />
</span>
- <span class="ml10">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
+ <span class="ml5">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
<a-tooltip title="海拔高度">
<span>ASL</span>
- <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.height === str ? str :
+ <span class="ml5">{{ !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="高于起飞高度">
<span>ALT</span>
- <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.elevation === str ? str :
+ <span class="ml5">{{ !deviceInfo.device || deviceInfo.device.elevation === str ? str :
deviceInfo.device?.elevation.toFixed(2) + ' m' }}</span>
</a-tooltip>
</a-col>
@@ -457,7 +505,7 @@
<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 :
+ <span class="ml5">{{ !deviceInfo.device || deviceInfo.device.home_distance === str ? str :
deviceInfo.device?.home_distance.toFixed(2) + ' m' }}</span>
</a-tooltip>
</a-col>
@@ -466,25 +514,90 @@
<a-col span="6">
<a-tooltip title="水平速度">
<span>H.S</span>
- <span class="ml10">{{ !deviceInfo.device || deviceInfo.device?.horizontal_speed === str ? str :
+ <span class="ml5">{{ !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="垂直速度">
<span>V.S</span>
- <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.vertical_speed === str ? str :
+ <span class="ml5">{{ !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="风速">
<span>W.S</span>
- <span class="ml10">{{ !deviceInfo.device || deviceInfo.device.wind_speed === str ? str :
+ <span class="ml5">{{ !deviceInfo.device || deviceInfo.device.wind_speed === str ? str :
(deviceInfo.device?.wind_speed / 10).toFixed(2) + ' m/s' }}</span>
</a-tooltip>
</a-col>
+ </a-row> -->
+ <a-row align="middle">
+ <a-col span="6" class="flex-row flex-align-center flex-justify-start">
+ <a-tooltip title="飞行模式">
+ <span>
+ <ControlOutlined class="fz16" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device ? EGear[deviceInfo.device?.gear] : str }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="RTK">
+ <span>
+ <TrademarkOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="无人机电池电量">
+ <span>
+ <ThunderboltOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device && deviceInfo.device.battery.capacity_percent !== str ?
+ deviceInfo.device?.battery.capacity_percent + ' %' : str }}</span>
+ </a-tooltip>
+ </a-col>
</a-row>
+ <a-row align="middle" class="mt10">
+ <a-col span="6">
+ <a-tooltip title="海拔高度">
+ <span>ASL</span>
+ <span class="ml5">{{ !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="高于起飞高度">
+ <span>ALT</span>
+ <span class="ml5">{{ !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="水平速度">
+ <span>H.S</span>
+ <span class="ml5">{{ !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="垂直速度">
+ <span>V.S</span>
+ <span class="ml5">{{ !deviceInfo.device || deviceInfo.device.vertical_speed === str ? str :
+ deviceInfo.device?.vertical_speed.toFixed(2) + ' m/s' }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ </div>
+ <!-- 飞行控制 -->
+ <div class="fly-control flex-display">
+ <div class="flex-column flex-align-stretch flex-justify-center" style="width: 100px; background: #2d2d2d;">
+ <div style="cursor: pointer;" class="p10 flex-column flex-align-center flex-justify-center">
+ <span><a-image :src="M30" :preview="false" /></span>
+ <span>一键起飞</span>
+ </div>
</div>
</div>
<div class="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0"
@@ -507,7 +620,7 @@
</div>
</template>
-<script lang="ts" setup>
+<script lang="ts">
import { computed, defineComponent, onMounted, reactive, ref, watch } from 'vue'
import {
generateLineContent,
@@ -527,6 +640,9 @@
import { uuidv4 } from '/@/utils/uuid'
import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
import { deviceTsaUpdate } from '/@/hooks/use-g-map-tsa'
+import Jessibuca from '/@/components/Jessibuca/Jessibuca.vue'
+import { CURRENT_CONFIG as config } from '/@/api/http/config'
+import { getLiveCapacity, startLivestream, stopLivestream } from '/@/api/manage'
import {
DeviceOsd, DeviceStatus, DockOsd, EGear, EModeCode, GatewayOsd, EDockModeCode, EDockModeText, EModeText,
NetworkStateQualityEnum, NetworkStateTypeEnum, RainfallEnum, DroneInDockEnum
@@ -543,343 +659,518 @@
import { useDockControl } from './g-map/use-dock-control'
import DroneControlPanel from './g-map/DroneControlPanel.vue'
import { useConnectMqtt } from './g-map/use-connect-mqtt'
-const useMouseToolHook = useMouseTool()
-const useGMapManageHook = useGMapManage()
-const deviceTsaUpdateHook = deviceTsaUpdate()
-const root = getRoot()
-const mouseMode = ref(false)
-const store = useMyStore()
-const state = reactive({
- currentType: '',
- coverIndex: 0
-})
-const str: string = '--'
-const deviceInfo = reactive({
- gateway: {
- capacity_percent: str,
- transmission_signal_quality: str,
- } as GatewayOsd,
- dock: {
-
- } as DockOsd,
- device: {
- gear: -1,
- mode_code: EModeCode.Disconnected,
- height: str,
- home_distance: str,
- horizontal_speed: str,
- vertical_speed: str,
- wind_speed: str,
- wind_direction: str,
- elevation: str,
- position_state: {
- gps_number: str,
- is_fixed: 0,
- rtk_number: str
- },
- battery: {
- capacity_percent: str,
- landing_power: str,
- remain_flight_time: 0,
- return_home_power: str,
- },
- latitude: 0,
- longitude: 0,
- } as DeviceOsd
-})
-const shareId = computed(() => {
- return store.state.layerBaseInfo.share
-})
-const defaultId = computed(() => {
- return store.state.layerBaseInfo.default
-})
-const drawVisible = computed(() => {
- return store.state.drawVisible
-})
-const osdVisible = computed(() => {
- return store.state.osdVisible
-})
-
-watch(() => store.state.deviceStatusEvent,
- data => {
- if (Object.keys(data.deviceOnline).length !== 0) {
- 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.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)
- }
- store.state.deviceStatusEvent.deviceOffline = {}
- }
+export default defineComponent({
+ components: {
+ BorderOutlined,
+ LineOutlined,
+ CloseOutlined,
+ ControlOutlined,
+ TrademarkOutlined,
+ ThunderboltOutlined,
+ SignalFilled,
+ GlobalOutlined,
+ HistoryOutlined,
+ CloudUploadOutlined,
+ FieldTimeOutlined,
+ CloudOutlined,
+ CloudFilled,
+ FolderOpenOutlined,
+ RobotFilled,
+ ArrowUpOutlined,
+ ArrowDownOutlined,
+ DockControlPanel,
+ DroneControlPanel,
+ CarryOutOutlined,
+ RocketOutlined
},
- {
- deep: true
- }
-)
+ name: 'GMap',
+ props: {},
+ setup () {
+ const useMouseToolHook = useMouseTool()
+ const useGMapManageHook = useGMapManage()
+ const deviceTsaUpdateHook = deviceTsaUpdate()
+ interface SelectOption {
+ value: any,
+ label: string,
+ more?: any
+}
+ const root = getRoot()
+ // 监控显示
+ const showMonitor = ref(false)
+ // 操作显示
+ const showOption = ref(false)
+ // 飞行控制显示
+ const showFly = ref(false)
+ const mouseMode = ref(false)
+ const store = useMyStore()
+ // 机场直播地址
+ const airPortUrl = ref('')
+ // 设备列表
+ const droneList = ref()
+ // 设备相机
+ const cameraList = ref()
+ // 相机设备选择值
+ const cameraIndex = ref(0)
+ // 设备列表选择值
+ const droneIndex = ref(0)
+ // 视频列表选择值
+ const videoList = ref()
+ const videoIndex = ref(0)
+ // 机场加载值
+ // const spinning = ref(false)
+ const state = reactive({
+ currentType: '',
+ coverIndex: 0
+ })
+ const str: string = '--'
+ const deviceInfo = reactive({
+ gateway: {
+ capacity_percent: str,
+ transmission_signal_quality: str,
+ } as GatewayOsd,
+ dock: {
-watch(() => store.state.deviceState, data => {
- if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
- 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]
+ } as DockOsd,
+ device: {
+ gear: -1,
+ mode_code: EModeCode.Disconnected,
+ height: str,
+ home_distance: str,
+ horizontal_speed: str,
+ vertical_speed: str,
+ wind_speed: str,
+ wind_direction: str,
+ elevation: str,
+ position_state: {
+ gps_number: str,
+ is_fixed: 0,
+ rtk_number: str
+ },
+ battery: {
+ capacity_percent: str,
+ landing_power: str,
+ remain_flight_time: 0,
+ return_home_power: str,
+ },
+ latitude: 0,
+ longitude: 0,
+ } as DeviceOsd
+ })
+ const shareId = computed(() => {
+ return store.state.layerBaseInfo.share
+ })
+ const defaultId = computed(() => {
+ return store.state.layerBaseInfo.default
+ })
+ const drawVisible = computed(() => {
+ return store.state.drawVisible
+ })
+ const osdVisible = computed(() => {
+ return store.state.osdVisible
+ })
+ const sn = computed(() => {
+ return store.state.hmsInfoDetailSn
+ })
+ const hmsInfo = computed({
+ get: () => store.state.hmsInfo,
+ set: (val) => {
+ return val
+ }
+ })
+ // 打开监控权限
+ const openMonitor = () => {
+ showMonitor.value = !showMonitor.value
+ if (showMonitor.value) {
+ loadVideo()
+ } else {
+ onClose()
+ }
}
- }
- if (data.currentType === EDeviceTypeName.Aircraft && data.deviceInfo[data.currentSn]) {
- 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.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
- }
- }
-}, {
- deep: true
-})
-
-watch(
- () => store.state.wsEvent,
- newData => {
- const useGMapCoverHook = useGMapCover()
- const event = newData
- let exist = false
- if (Object.keys(event.mapElementCreat).length !== 0) {
- console.log(event.mapElementCreat)
- const ele = event.mapElementCreat
- store.state.Layers.forEach(layer => {
- layer.elements.forEach(e => {
- if (e.id === ele.id) {
- exist = true
- console.log('true')
+ // 加载该设备的视频信息
+ const loadVideo = async () => {
+ droneList.value = []
+ cameraList.value = []
+ videoList.value = []
+ droneIndex.value = 0
+ cameraIndex.value = 0
+ await getLiveCapacity({})
+ .then(res => {
+ if (res.code === 0) {
+ if (res.data === null) {
+ console.warn('warning: get live capacity is null!!!')
+ return
+ }
+ const resData: Array<[]> = res.data
+ const temp: Array<SelectOption> = []
+ if (resData) {
+ resData.forEach((ele: any) => {
+ temp.push({ label: ele.name, value: ele.sn, more: ele.cameras_list })
+ })
+ droneList.value = temp.filter(v => v.value === sn.value)
+ if (droneList.value[0].more.length <= 0) return
+ cameraList.value = droneList.value[droneIndex.value].more.map((v: { name: any; index: any; videos_list: any }) => {
+ return {
+ label: v.name,
+ value: v.index,
+ more: v.videos_list
+ }
+ })
+ videoList.value = cameraList.value[cameraIndex.value].more.map((v) => {
+ return {
+ label: v.type,
+ value: v.index,
+ }
+ })
+ onStart()
+ }
}
})
+ .catch(error => {
+ // message.error(error)
+ console.error(error)
+ })
+ }
+ // 设备开始播放
+ const onStart = async () => {
+ const videoId = droneList.value[droneIndex.value].value + '/' + cameraList.value[cameraIndex.value].value + '/' + videoList.value[videoIndex.value].value
+ const streamId = droneList.value[droneIndex.value].value + '-' + cameraList.value[cameraIndex.value].value + '-' + videoList.value[videoIndex.value].value
+ const liveURL = config.rtmpURL + streamId
+ await startLivestream({
+ url: liveURL,
+ video_id: videoId,
+ url_type: 1,
+ video_quality: 0
})
- if (exist === false) {
- setLayers({
- id: ele.id,
- name: ele.name,
- resource: ele.resource
+ .then(res => {
+ if (res.code !== 0) return
+ console.log(res, 'res')
+ airPortUrl.value = res.data.url
+ console.log(airPortUrl.value, 'airPortUrl')
})
+ }
+ // 关闭设备直播
+ const onClose = async () => {
+ const videoId = droneList.value[droneIndex.value].value + '/' + cameraList.value[cameraIndex.value].value + '/' + videoList.value[videoIndex.value].value
- updateCoordinates('wgs84-gcj02', ele)
- useGMapCoverHook.init2DPin(
- ele.name,
- ele.resource.content.geometry.coordinates,
- ele.resource.content.properties.color,
- {
- id: ele.id,
- name: ele.name
+ stopLivestream({
+ video_id: videoId
+ }).then(res => {
+ if (res.code === 0) {
+ console.log('stop play livestream')
+ airPortUrl.value = ''
+ }
+ })
+ }
+ watch(() => store.state.deviceStatusEvent,
+ data => {
+ if (Object.keys(data.deviceOnline).length !== 0) {
+ 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.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)
}
- )
+ store.state.deviceStatusEvent.deviceOffline = {}
+ }
+ },
+ {
+ deep: true
}
+ )
- store.state.wsEvent.mapElementCreat = {}
+ watch(() => store.state.deviceState, data => {
+ if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
+ 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.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.basic_osd.sub_device?.device_sn ?? osdVisible.value.sn]
+ }
+ }
+ }, {
+ deep: true
+ })
+
+ watch(
+ () => store.state.wsEvent,
+ newData => {
+ const useGMapCoverHook = useGMapCover()
+ const event = newData
+ let exist = false
+ if (Object.keys(event.mapElementCreat).length !== 0) {
+ console.log(event.mapElementCreat)
+ const ele = event.mapElementCreat
+ store.state.Layers.forEach(layer => {
+ layer.elements.forEach(e => {
+ if (e.id === ele.id) {
+ exist = true
+ console.log('true')
+ }
+ })
+ })
+ if (exist === false) {
+ setLayers({
+ id: ele.id,
+ name: ele.name,
+ resource: ele.resource
+ })
+
+ updateCoordinates('wgs84-gcj02', ele)
+ useGMapCoverHook.init2DPin(
+ ele.name,
+ ele.resource.content.geometry.coordinates,
+ ele.resource.content.properties.color,
+ {
+ id: ele.id,
+ name: ele.name
+ }
+ )
+ }
+
+ store.state.wsEvent.mapElementCreat = {}
+ }
+ if (Object.keys(event.mapElementUpdate).length !== 0) {
+ console.log(event.mapElementUpdate)
+ console.log('该功能还未实现，请开发商自己增加')
+ store.state.wsEvent.mapElementUpdate = {}
+ }
+ if (Object.keys(event.mapElementDelete).length !== 0) {
+ console.log(event.mapElementDelete)
+ console.log('该功能还未实现，请开发商自己增加')
+ store.state.wsEvent.mapElementDelete = {}
+ }
+ },
+ {
+ deep: true
+ }
+ )
+
+ function draw (type: MapDoodleType, bool: boolean) {
+ state.currentType = type
+ useMouseToolHook.mouseTool(type, getDrawCallback)
+ mouseMode.value = bool
}
- if (Object.keys(event.mapElementUpdate).length !== 0) {
- console.log(event.mapElementUpdate)
- console.log('该功能还未实现，请开发商自己增加')
- store.state.wsEvent.mapElementUpdate = {}
+
+ // dock 控制面板
+ const {
+ dockControlPanelVisible,
+ setDockControlPanelVisible,
+ onCloseControlPanel,
+ } = useDockControl()
+
+ // 连接或断开drc
+ useConnectMqtt()
+
+ onMounted(() => {
+ const app = getApp()
+ useGMapManageHook.globalPropertiesConfig(app)
+ })
+
+ function getDrawCallback ({ obj }) {
+ switch (state.currentType) {
+ case MapDoodleEnum.PIN:
+ postPinPositionResource(obj)
+ break
+ case MapDoodleEnum.POLYLINE:
+ postPolylineResource(obj)
+ break
+ case MapDoodleEnum.POLYGON:
+ postPolygonResource(obj)
+ break
+ default:
+ break
+ }
}
- if (Object.keys(event.mapElementDelete).length !== 0) {
- console.log(event.mapElementDelete)
- console.log('该功能还未实现，请开发商自己增加')
- store.state.wsEvent.mapElementDelete = {}
+ async function postPinPositionResource (obj: { setExtData: (arg0: { id: string; name: any }) => void }) {
+ const req = getPinPositionResource(obj)
+ setLayers(req)
+ const coordinates = req.resource.content.geometry.coordinates
+ updateCoordinates('gcj02-wgs84', req);
+ (req.resource.content.geometry.coordinates as GeojsonCoordinate).push((coordinates as GeojsonCoordinate)[2])
+ const result = await postElementsReq(shareId.value, req)
+ obj.setExtData({ id: req.id, name: req.name })
+ store.state.coverList.push(obj)
+ // console.log(store.state.coverList)
}
- },
- {
- deep: true
+ async function postPolylineResource (obj: { setExtData: (arg0: { id: string; name: any }) => void }) {
+ const req = getPolylineResource(obj)
+ setLayers(req)
+ updateCoordinates('gcj02-wgs84', req)
+ const result = await postElementsReq(shareId.value, req)
+ obj.setExtData({ id: req.id, name: req.name })
+ store.state.coverList.push(obj)
+ // console.log(store.state.coverList)
+ }
+ async function postPolygonResource (obj: { setExtData: (arg0: { id: string; name: any }) => void }) {
+ const req = getPoygonResource(obj)
+ setLayers(req)
+ updateCoordinates('gcj02-wgs84', req)
+ const result = await postElementsReq(shareId.value, req)
+ obj.setExtData({ id: req.id, name: req.name })
+ store.state.coverList.push(obj)
+ // console.log(store.state.coverList)
+ }
+
+ function getPinPositionResource (obj: { getPosition: () => any; _originOpts: { title: any } }) {
+ const position = obj.getPosition()
+ const resource = generatePointContent(position)
+ const name = obj._originOpts.title
+ const id = uuidv4()
+ return {
+ id,
+ name,
+ resource
+ }
+ }
+ function getPolylineResource (obj: { getPath: () => any; _opts: any }) {
+ const path = obj.getPath()
+ const resource = generateLineContent(path)
+ const { name, id } = getBaseInfo(obj._opts)
+ return {
+ id,
+ name,
+ resource
+ }
+ }
+ function getPoygonResource (obj: { getPath: () => any; _opts: any }) {
+ const path = obj.getPath()
+ const resource = generatePolyContent(path)
+ const { name, id } = getBaseInfo(obj._opts)
+ return {
+ id,
+ name,
+ resource
+ }
+ }
+ function getBaseInfo (obj: { title: any }) {
+ const name = obj.title
+ const id = uuidv4()
+ return { name, id }
+ }
+ function setLayers (resource: PostElementsBody) {
+ const layers = store.state.Layers
+ const layer = layers.find(item => item.id.includes(shareId.value))
+ // layer.id = 'private_layer' + uuidv4()
+ // layer?.elements.push(resource)
+ if (layer?.elements) {
+ ; (layer?.elements as any[]).push(resource)
+ }
+ console.log('layers', layers)
+ store.commit('SET_LAYER_INFO', layers)
+ }
+ function updateCoordinates (transformType: string, element: any) {
+ const geoType = element.resource?.content.geometry.type
+ const type = element.resource?.type as number
+ if (element.resource) {
+ if (MapElementEnum.PIN === type) {
+ const coordinates = element.resource?.content.geometry
+ .coordinates as GeojsonCoordinate
+ if (transformType === 'wgs84-gcj02') {
+ const transResult = wgs84togcj02(
+ coordinates[0],
+ coordinates[1]
+ ) as GeojsonCoordinate
+ element.resource.content.geometry.coordinates = transResult
+ } else if (transformType === 'gcj02-wgs84') {
+ const transResult = gcj02towgs84(
+ coordinates[0],
+ coordinates[1]
+ ) as GeojsonCoordinate
+ element.resource.content.geometry.coordinates = transResult
+ }
+ } else if (MapElementEnum.LINE === type && geoType === 'LineString') {
+ const coordinates = element.resource?.content.geometry
+ .coordinates as GeojsonCoordinate[]
+ if (transformType === 'wgs84-gcj02') {
+ coordinates.forEach(coordinate => {
+ coordinate = wgs84togcj02(
+ coordinate[0],
+ coordinate[1]
+ ) as GeojsonCoordinate
+ })
+ } else if (transformType === 'gcj02-wgs84') {
+ coordinates.forEach(coordinate => {
+ coordinate = gcj02towgs84(
+ coordinate[0],
+ coordinate[1]
+ ) as GeojsonCoordinate
+ })
+ }
+ element.resource.content.geometry.coordinates = coordinates
+ } else if (MapElementEnum.LINE === type && geoType === 'Polygon') {
+ const coordinates = element.resource?.content.geometry
+ .coordinates[0] as GeojsonCoordinate[]
+
+ if (transformType === 'wgs84-gcj02') {
+ coordinates.forEach(coordinate => {
+ coordinate = wgs84togcj02(
+ coordinate[0],
+ coordinate[1]
+ ) as GeojsonCoordinate
+ })
+ } else if (transformType === 'gcj02-wgs84') {
+ coordinates.forEach(coordinate => {
+ coordinate = gcj02towgs84(
+ coordinate[0],
+ coordinate[1]
+ ) as GeojsonCoordinate
+ })
+ }
+ element.resource.content.geometry.coordinates = [coordinates]
+ }
+ }
+ }
+ return {
+ draw,
+ mouseMode,
+ drawVisible,
+ osdVisible,
+ pin,
+ state,
+ M30,
+ deviceInfo,
+ EGear,
+ EModeCode,
+ str,
+ EDockModeCode,
+ EDockModeText,
+ EModeText,
+ dockControlPanelVisible,
+ setDockControlPanelVisible,
+ onCloseControlPanel,
+ NetworkStateTypeEnum,
+ NetworkStateQualityEnum,
+ RainfallEnum,
+ DroneInDockEnum,
+ hmsInfo,
+ sn,
+ showMonitor,
+ showOption,
+ showFly,
+ airPortUrl,
+ openMonitor,
+ }
}
-)
-
-function draw (type: MapDoodleType, bool: boolean) {
- state.currentType = type
- useMouseToolHook.mouseTool(type, getDrawCallback)
- mouseMode.value = bool
-}
-
-// dock 控制面板
-const {
- dockControlPanelVisible,
- setDockControlPanelVisible,
- onCloseControlPanel,
-} = useDockControl()
-
-// 连接或断开drc
-useConnectMqtt()
-
-onMounted(async () => {
- await nextTick()
- const app = getApp()
- setTimeout(() => {
- useGMapManageHook.globalPropertiesConfig(app)
- }, 1000)
})
-
-function getDrawCallback ({ obj }) {
- switch (state.currentType) {
- case MapDoodleEnum.PIN:
- postPinPositionResource(obj)
- break
- case MapDoodleEnum.POLYLINE:
- postPolylineResource(obj)
- break
- case MapDoodleEnum.POLYGON:
- postPolygonResource(obj)
- break
- default:
- break
- }
-}
-async function postPinPositionResource (obj) {
- const req = getPinPositionResource(obj)
- setLayers(req)
- const coordinates = req.resource.content.geometry.coordinates
- updateCoordinates('gcj02-wgs84', req);
- (req.resource.content.geometry.coordinates as GeojsonCoordinate).push((coordinates as GeojsonCoordinate)[2])
- const result = await postElementsReq(shareId.value, req)
- obj.setExtData({ id: req.id, name: req.name })
- store.state.coverList.push(obj)
- // console.log(store.state.coverList)
-}
-async function postPolylineResource (obj) {
- const req = getPolylineResource(obj)
- setLayers(req)
- updateCoordinates('gcj02-wgs84', req)
- const result = await postElementsReq(shareId.value, req)
- obj.setExtData({ id: req.id, name: req.name })
- store.state.coverList.push(obj)
- // console.log(store.state.coverList)
-}
-async function postPolygonResource (obj) {
- const req = getPoygonResource(obj)
- setLayers(req)
- updateCoordinates('gcj02-wgs84', req)
- const result = await postElementsReq(shareId.value, req)
- obj.setExtData({ id: req.id, name: req.name })
- store.state.coverList.push(obj)
- // console.log(store.state.coverList)
-}
-
-function getPinPositionResource (obj) {
- const position = obj.getPosition()
- const resource = generatePointContent(position)
- const name = obj._originOpts.title
- const id = uuidv4()
- return {
- id,
- name,
- resource
- }
-}
-function getPolylineResource (obj) {
- const path = obj.getPath()
- const resource = generateLineContent(path)
- const { name, id } = getBaseInfo(obj._opts)
- return {
- id,
- name,
- resource
- }
-}
-function getPoygonResource (obj) {
- const path = obj.getPath()
- const resource = generatePolyContent(path)
- const { name, id } = getBaseInfo(obj._opts)
- return {
- id,
- name,
- resource
- }
-}
-function getBaseInfo (obj) {
- const name = obj.title
- const id = uuidv4()
- return { name, id }
-}
-function setLayers (resource: PostElementsBody) {
- const layers = store.state.Layers
- const layer = layers.find(item => item.id.includes(shareId.value))
- // layer.id = 'private_layer' + uuidv4()
- // layer?.elements.push(resource)
- if (layer?.elements) {
- ; (layer?.elements as any[]).push(resource)
- }
- console.log('layers', layers)
- store.commit('SET_LAYER_INFO', layers)
-}
-function updateCoordinates (transformType: string, element: any) {
- const geoType = element.resource?.content.geometry.type
- const type = element.resource?.type as number
- if (element.resource) {
- if (MapElementEnum.PIN === type) {
- const coordinates = element.resource?.content.geometry
- .coordinates as GeojsonCoordinate
- if (transformType === 'wgs84-gcj02') {
- const transResult = wgs84togcj02(
- coordinates[0],
- coordinates[1]
- ) as GeojsonCoordinate
- element.resource.content.geometry.coordinates = transResult
- } else if (transformType === 'gcj02-wgs84') {
- const transResult = gcj02towgs84(
- coordinates[0],
- coordinates[1]
- ) as GeojsonCoordinate
- element.resource.content.geometry.coordinates = transResult
- }
- } else if (MapElementEnum.LINE === type && geoType === 'LineString') {
- const coordinates = element.resource?.content.geometry
- .coordinates as GeojsonCoordinate[]
- if (transformType === 'wgs84-gcj02') {
- coordinates.forEach(coordinate => {
- coordinate = wgs84togcj02(
- coordinate[0],
- coordinate[1]
- ) as GeojsonCoordinate
- })
- } else if (transformType === 'gcj02-wgs84') {
- coordinates.forEach(coordinate => {
- coordinate = gcj02towgs84(
- coordinate[0],
- coordinate[1]
- ) as GeojsonCoordinate
- })
- }
- element.resource.content.geometry.coordinates = coordinates
- } else if (MapElementEnum.LINE === type && geoType === 'Polygon') {
- const coordinates = element.resource?.content.geometry
- .coordinates[0] as GeojsonCoordinate[]
-
- if (transformType === 'wgs84-gcj02') {
- coordinates.forEach(coordinate => {
- coordinate = wgs84togcj02(
- coordinate[0],
- coordinate[1]
- ) as GeojsonCoordinate
- })
- } else if (transformType === 'gcj02-wgs84') {
- coordinates.forEach(coordinate => {
- coordinate = gcj02towgs84(
- coordinate[0],
- coordinate[1]
- ) as GeojsonCoordinate
- })
- }
- element.resource.content.geometry.coordinates = [coordinates]
- }
- }
-}
</script>
-<style lang="scss" scoped>.g-map-wrapper {
+<style lang="scss" scoped>
+.g-map-wrapper {
height: 100%;
width: 100%;
@@ -929,6 +1220,29 @@
opacity: 0.8;
}
+.overflow {
+ width: 100%;
+ overflow: hidden;
+ background-color: #ff9900;
+ // padding: 2px 5px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+.osd-info {
+ margin: 15px 10px;
+}
+.num {
+ padding: 0 5px;
+ background-color: #ff9900;
+ color: #fff;
+}
+
+.span5 {
+ display: flex;
+ align-items: center;
+ padding-right: 20px;
+}
+
.osd>div:not(.dock-control-panel) {
margin-top: 5px;
padding-left: 5px;
--
Gitblit v1.9.3