From 9464e5a8d69ff40dd0fef0e02d1947de15621c24 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 18 Sep 2023 09:27:06 +0800
Subject: [PATCH] 部分样式修改、添加视频播放组件
---
src/components/GMap.vue | 773 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 505 insertions(+), 268 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 4da5129..a7bd038 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -3,169 +3,206 @@
<!-- 地图区域 -->
<div id="g-container" :style="{ width: '100%', height: '100%' }" />
<!-- 绘制面板 -->
- <div
- class="g-action-panel"
- :style="{ right: drawVisible ? '316px' : '16px' }"
- >
+ <div 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)">
<a><a-image :src="pin" :preview="false" /></a>
</div>
- <div :class="state.currentType === 'polyline' ? 'g-action-item selection' : 'g-action-item'" @click="draw('polyline', true)">
- <a><LineOutlined :rotate="135" class="fz20"/></a>
+ <div :class="state.currentType === 'polyline' ? 'g-action-item selection' : 'g-action-item'"
+ @click="draw('polyline', true)">
+ <a>
+ <LineOutlined :rotate="135" class="fz20" />
+ </a>
</div>
- <div :class="state.currentType === 'polygon' ? 'g-action-item selection' : 'g-action-item'" @click="draw('polygon', true)">
- <a><BorderOutlined class="fz18" /></a>
+ <div :class="state.currentType === 'polygon' ? 'g-action-item selection' : 'g-action-item'"
+ @click="draw('polygon', true)">
+ <a>
+ <BorderOutlined class="fz18" />
+ </a>
</div>
<div v-if="mouseMode" class="g-action-item" @click="draw('off', false)">
- <a style="color: red;"><CloseOutlined /></a>
+ <a style="color: red;">
+ <CloseOutlined />
+ </a>
</div>
</div>
<!-- 飞机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%;">
+ <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>
+ <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="margin-top: -5px; padding-top: 25px; float: left; width: 60px; 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>
+ <span><a-image :src="M30" :preview="false" /></span>
<span>{{ osdVisible.model }}</span>
</div>
</a-tooltip>
</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)'">{{ EModeText[deviceInfo.device.mode_code] }}</a-col>
- </a-row>
- <a-row>
- <a-col span="6">
- <a-tooltip title="Signal strength">
- <span>HD</span>
- <span class="ml10">{{ deviceInfo.gateway?.transmission_signal_quality }}</span>
- </a-tooltip>
- </a-col>
- <a-col span="6">
- <a-tooltip title="RC Battery Level">
- <span><ThunderboltOutlined class="fz14"/></span>
- <span class="ml10">{{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ? deviceInfo.gateway.capacity_percent + ' %' : deviceInfo.gateway.capacity_percent }}</span>
- </a-tooltip>
- </a-col>
-
- <a-col span="6">
- <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固定">
- <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>
- </a-col>
+ <a-row>
+ <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">
+ <a-tooltip title="Signal strength">
+ <span>HD</span>
+ <span class="ml5">{{ deviceInfo.gateway?.transmission_signal_quality }}</span>
</a-tooltip>
- <a-col span="6">
- <a-tooltip title="GPS">
- <span>GPS</span>
- <span class="ml10">{{ deviceInfo.device.position_state.gps_number }}</span>
- </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="RC Battery Level">
+ <span>
+ <ThunderboltOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.gateway && deviceInfo.gateway.capacity_percent !== str ?
+ deviceInfo.gateway.capacity_percent + ' %' : deviceInfo.gateway.capacity_percent }}</span>
+ </a-tooltip>
+ </a-col>
+
+ <a-col span="6">
+ <a-tooltip title="无人机电池电量">
+ <span>
+ <ThunderboltOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ 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固定">
+ <a-col span="6" class="flex-row flex-align-center flex-justify-start">
+ <span>Fixed</span>
+ <span class="ml5 circle"
+ :style="deviceInfo.device.position_state.is_fixed === 1 ? 'backgroud: rgb(25,190,107);' : ' background: red;'"></span>
</a-col>
- <a-col span="6">
- <a-tooltip title="RTK">
- <span><TrademarkOutlined class="fz14"/></span>
- <span class="ml10">{{ deviceInfo.device.position_state.rtk_number }}</span>
- </a-tooltip>
- </a-col>
- </a-row>
- <a-row>
- <a-col span="6">
- <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="海拔高度">
- <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="高于起飞高度">
- <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="到起点距离">
- <span>H</span>
- <span class="ml10">{{ deviceInfo.device.home_distance === str ? str : deviceInfo.device.home_distance.toFixed(2) + ' m' }}</span>
- </a-tooltip>
- </a-col>
- </a-row>
- <a-row>
- <a-col span="6">
- <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="垂直速度">
- <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="风速">
- <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>
- </a-col>
- </a-row>
+ </a-tooltip>
+ <a-col span="6">
+ <a-tooltip title="GPS">
+ <span>GPS</span>
+ <span class="ml5">{{ deviceInfo.device.position_state.gps_number }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="RTK">
+ <span>
+ <TrademarkOutlined class="fz14" />
+ </span>
+ <span class="ml5">{{ deviceInfo.device.position_state.rtk_number }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col span="6">
+ <a-tooltip title="飞行模式">
+ <span>
+ <ControlOutlined class="fz16" />
+ </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="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="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="ml5">{{ deviceInfo.device.home_distance === str ? str :
+ deviceInfo.device.home_distance.toFixed(2) + ' m' }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col span="6">
+ <a-tooltip title="水平速度">
+ <span>H.S</span>
+ <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="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="ml5">{{ 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.battery.remain_flight_time !== 0">
<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>
- <div class="white-point" :style="{ left: deviceInfo.device.battery.landing_power + '%'}"></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>
+ <div class="white-point" :style="{ left: deviceInfo.device.battery.landing_power + '%' }"></div>
<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 }}
+ {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' :
+ '' }}{{ deviceInfo.device.battery.remain_flight_time % 60 }}
</div>
</div>
</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%;">
+ <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>
+ <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%;">
- <span><RobotFilled style="font-size: 48px;"/></span>
+ <span>
+ <RobotFilled style="font-size: 48px;" />
+ </span>
<span class="mt10">Dock</span>
</div>
</a-tooltip>
</div>
<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)'">
- {{ EDockModeText[deviceInfo.dock.basic_osd?.mode_code] }}</a-col>
- </a-row>
- <a-row>
- <a-col span="12">
+ <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-col span="1">{{ hmsInfo[sn]?.length || 1 }}</a-col> -->
+ <a-col span="1" class="num">1</a-col>
+ <a-col span="13" style="background-color: #ff9900;width: 100%;padding-left:5px ;"> <span>{{ '机场配电柜门打开'
+ }}</span> </a-col>
+ </a-row>
+ <a-row>
+ <!-- <a-col span="12">
<a-tooltip title="累计运行时间">
<span><HistoryOutlined /></span>
- <span class="ml10">
+ <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>
@@ -173,16 +210,56 @@
<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-col> -->
+ <a-col span="9">
+ <a-tooltip title="降雨量">
+ <span>🌧</span>
+ <span class="ml5">{{ RainfallEnum[deviceInfo.dock.basic_osd?.rainfall] }}</span>
+ </a-tooltip>
+ </a-col>
+ <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="12">
<a-tooltip title="激活时间">
<span><FieldTimeOutlined /></span>
- <span class="ml10">{{ new Date((deviceInfo.dock.work_osd?.activation_time ?? 0) * 1000).toLocaleString() }}
+ <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> -->
+ </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 ?
@@ -190,19 +267,19 @@
<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.basic_osd?.network_state?.rate }} kb/s</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="ml10" >{{ deviceInfo.dock.work_osd?.job_number }} </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="ml10">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
+ <span class="ml5">{{ deviceInfo.dock.link_osd?.media_file_detail?.remain_upload }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -212,7 +289,7 @@
<p>已使用: {{ deviceInfo.dock.basic_osd?.storage?.used }}</p>
</template>
<span><FolderOpenOutlined /></span>
- <span class="ml10" v-if="deviceInfo.dock.basic_osd?.storage?.total > 0">
+ <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>
@@ -223,25 +300,25 @@
<a-col span="6">
<a-tooltip title="风速">
<span>W.S</span>
- <span class="ml10">{{ (deviceInfo.dock.basic_osd?.wind_speed ?? str) + ' m/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="ml10">{{ RainfallEnum[deviceInfo.dock.basic_osd?.降雨量] }}</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>
+ <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="ml10">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
+ <span class="ml5">{{ deviceInfo.dock.basic_osd?.temperature }}</span>
</a-tooltip>
</a-col>
</a-row>
@@ -249,169 +326,288 @@
<a-col span="6">
<a-tooltip title="设备湿度">
<span>💦</span>
- <span class="ml10">{{ deviceInfo.dock.basic_osd?.humidity }}</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="ml10">{{ (deviceInfo.dock.work_osd?.working_voltage ?? str) + ' mV' }}</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="ml10">{{ (deviceInfo.dock.work_osd?.working_current ?? str) + ' mA' }}</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="ml10">{{ DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] }}</span>
+ <span class="ml5">{{ 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" @click="setDockControlPanelVisible(true)">
- 操作
- </a-button>
- </a-col>
- </a-row>
- <!-- 机场控制面板 -->
- <DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" @close-control-panel="onCloseControlPanel">
- </DockControlPanel>
+ </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">
+ 监控
+ </a-button>
+ </a-col>
+ <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>
+ </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-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>
+ <span><a-image :src="M30" :preview="false" /></span>
<span>M30</span>
</div>
</a-tooltip>
</div>
<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 ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code] }}</a-col>
- </a-row>
- <a-row>
- <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>
- </a-tooltip>
- </a-col>
- <a-col span="6">
- <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="无人机电池电量">
- <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>总供: {{ 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">
- <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>
- <a-row>
- <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>
- </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>
- </a-tooltip>
- </a-col>
- <a-col span="6">
- <a-tooltip title="RTK">
- <span><TrademarkOutlined class="fz14"/></span>
- <span class="ml10">{{ deviceInfo.device ? deviceInfo.device.position_state.rtk_number : str }}</span>
- </a-tooltip>
- </a-col>
- </a-row>
- <a-row>
- <a-col span="6">
- <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="海拔高度">
- <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="高于起飞高度">
- <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="到起点距离">
- <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>
- </a-col>
- </a-row>
- <a-row>
- <a-col span="6">
- <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="垂直速度">
- <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="风速">
- <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>
+ <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 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="battery-slide" v-if="deviceInfo.device && deviceInfo.device.battery.remain_flight_time !== 0" style="border: 1px solid red">
+ <!-- 飞机图标信息 -->
+ <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="ml5">{{ deviceInfo.dock.link_osd?.sdr?.up_quality }}</span>
+ </a-tooltip>
+ </a-col>
+ <a-col span="6">
+ <a-tooltip title="向下质量">
+ <span>
+ <SignalFilled />
+ <ArrowDownOutlined style="font-size: 9px; vertical-align: top;" />
+ </span>
+ <span class="ml5">{{ deviceInfo.dock.link_osd?.sdr?.down_quality }}</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-col span="6">
+ <a-tooltip>
+ <template #title>
+ <p>总供: {{ deviceInfo.device?.storage?.total }}</p>
+ <p>已使用: {{ deviceInfo.device?.storage?.used }}</p>
+ </template>
+ <span>
+ <FolderOpenOutlined />
+ </span>
+ <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"
+ :strokeColor="deviceInfo.device?.storage?.used * 100 / deviceInfo.device?.storage?.total > 80 ? 'red' : '#00ee8b'" />
+ </span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-tooltip title="RTK固定">
+ <a-col span="6" class="flex-row flex-align-center flex-justify-start">
+ <span>Fixed</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="ml5">{{ deviceInfo.device ? deviceInfo.device.position_state.gps_number : 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-row>
+ <a-row>
+ <a-col span="6">
+ <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="海拔高度">
+ <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
+ 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="ml5">{{ !deviceInfo.device || deviceInfo.device.home_distance === str ? str :
+ deviceInfo.device?.home_distance.toFixed(2) + ' m' }}</span>
+ </a-tooltip>
+ </a-col>
+ </a-row>
+ <a-row>
+ <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-col span="6">
+ <a-tooltip title="风速">
+ <span>W.S</span>
+ <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"
+ 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>
- <div class="white-point" :style="{ left: deviceInfo.device.battery.landing_power + '%'}"></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>
+ <div class="white-point" :style="{ left: deviceInfo.device.battery.landing_power + '%' }"></div>
<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 }}
+ {{ 10 > (deviceInfo.device.battery.remain_flight_time % 60) ? '0' :
+ '' }}{{ deviceInfo.device.battery.remain_flight_time % 60 }}
</div>
</div>
<!-- 飞行指令 -->
- <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads"></DroneControlPanel>
+ <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
+ </DroneControlPanel>
</div>
</div>
</template>
@@ -484,7 +680,12 @@
const useGMapManageHook = useGMapManage()
const deviceTsaUpdateHook = deviceTsaUpdate()
const root = getRoot()
-
+ // 监控显示
+ const showMonitor = ref(false)
+ // 操作显示
+ const showOption = ref(false)
+ // 飞行控制显示
+ const showFly = ref(false)
const mouseMode = ref(false)
const store = useMyStore()
const state = reactive({
@@ -536,6 +737,15 @@
})
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
+ }
})
watch(() => store.state.deviceStatusEvent,
@@ -744,7 +954,7 @@
// layer.id = 'private_layer' + uuidv4()
// layer?.elements.push(resource)
if (layer?.elements) {
- ;(layer?.elements as any[]).push(resource)
+ ; (layer?.elements as any[]).push(resource)
}
console.log('layers', layers)
store.commit('SET_LAYER_INFO', layers)
@@ -832,14 +1042,18 @@
NetworkStateTypeEnum,
NetworkStateQualityEnum,
RainfallEnum,
- DroneInDockEnum
+ DroneInDockEnum,
+ hmsInfo,
+ sn,
+ showMonitor,
+ showOption,
+ showFly
}
}
})
</script>
<style lang="scss" scoped>
-
.g-map-wrapper {
height: 100%;
width: 100%;
@@ -848,6 +1062,7 @@
position: absolute;
top: 16px;
right: 16px;
+
.g-action-item {
width: 28px;
height: 28px;
@@ -858,23 +1073,26 @@
text-align: center;
margin-bottom: 2px;
}
+
.g-action-item:hover {
border: 1px solid $primary;
border-radius: 2px;
}
}
+
.selection {
border: 1px solid $primary;
border-radius: 2px;
}
// antd button 光晕
- &:deep(.ant-btn){
+ &:deep(.ant-btn) {
&::after {
display: none;
}
}
}
+
.osd-panel {
position: absolute;
left: 10px;
@@ -885,7 +1103,22 @@
border-radius: 2px;
opacity: 0.8;
}
-.osd > div:not(.dock-control-panel) {
+.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;
}
@@ -900,12 +1133,15 @@
.capacity-percent {
background: #00ee8b;
}
+
.return-home {
background: #ff9f0a;
}
+
.landing {
background: #f5222d;
}
+
.white-point {
width: 4px;
height: 4px;
@@ -913,6 +1149,7 @@
background: white;
bottom: -0.5px;
}
+
.battery {
background: #141414;
color: #00ee8b;
@@ -923,9 +1160,9 @@
padding: 0 5px;
}
}
-.battery-slide > div {
+
+.battery-slide>div {
position: absolute;
min-height: 2px;
border-radius: 2px;
-}
-</style>
+}</style>
--
Gitblit v1.9.3