From 9e765ee8e2852409a1a98a6fb548b2d9d4111713 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Thu, 19 Oct 2023 17:25:34 +0800
Subject: [PATCH] 添加航线任务待提醒
---
src/components/GMap.vue | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 813c026..595dc27 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -113,13 +113,15 @@
<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>
+ <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>
+ <span class="ml5">{{ deviceInfo.device.elevation === str ? str : deviceInfo.device.elevation.toFixed(2) +
+ 'm' }}</span>
</a-tooltip>
</a-col>
<a-col span="6">
@@ -148,8 +150,7 @@
<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>
+ <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>
@@ -171,17 +172,33 @@
<!-- 机场OSD -->
<!-- && osdVisible.is_dock -->
<div class="osd-panel fz12" v-if="osdVisible.visible">
- <div class="fz16 pl5 pr5 flex-align-center flex-row flex-justify-between"
+ <div class="fz16 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="closeOsdWindow">
+ <div class="flex-align-center flex-justify-center" style="display: flex;">
+ <div v-if="osdVisible.latest_wayline_job" class="flex-column flex-align-center flex-justify-center">
+ <div class="task_wrapper">
+ <div class="task_content">
+ <div class="task_status">
+ <ContainerOutlined />
+ <span>待执行</span>
+ </div>
+ <div class="task_info">{{convertTimestampToDate(osdVisible.latest_wayline_job.begin_time)}}</div>
+ </div>
+ <div class="task_title">{{osdVisible.latest_wayline_job.name}}</div>
+ </div>
+ </div>
+ <span :style="[osdVisible.latest_wayline_job?'margin-left:20px':'']">{{ osdVisible.gateway_callsign }}</span>
+ </div>
+ <div>
+ <a style="color: white;" @click="closeOsdWindow">
<CloseOutlined />
- </a></span>
+ </a>
+ </div>
</div>
<!-- 机场 -->
<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">
+ <a-tooltip :title="osdVisible.gateway_callsign">
<div class="flex-column flex-align-center flex-justify-center" style="width: 90%;">
<span>
<RobotFilled style="font-size: 48px;" />
@@ -301,7 +318,7 @@
<a-col span="2"></a-col>
<a-col span="8">
<a-button :class="[airPortOption ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
- size="small" @click="openFlySetting">
+ size="small" @click="openFlySetting">
操作
</a-button>
</a-col>
@@ -436,19 +453,22 @@
<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>{{ DEVICE_NAME[`${osdVisible.device_domain}-${osdVisible.device_type}-${osdVisible.device_sub_type}`] }}</span>
+ <span>{{ DEVICE_NAME[`${osdVisible.device_domain}-${osdVisible.device_type}-${osdVisible.device_sub_type}`]
+ }}</span>
</div>
</a-tooltip>
</div>
<div class="osd flex-1">
<a-row class="mr-20" align="middle">
<a-col span="9"
- :style="deviceInfo.device && deviceInfo.device?.mode_code !== EModeCode.Disconnected ? 'color: rgb(25,190,107)' : deviceInfo.dock.basic_osd?.drone_in_dock === 1? 'color: rgb(25,190,107)' : 'color: red; font-weight: 700;' ">
+ :style="deviceInfo.device && deviceInfo.device?.mode_code !== EModeCode.Disconnected ? 'color: rgb(25,190,107)' : deviceInfo.dock.basic_osd?.drone_in_dock === 1 ? 'color: rgb(25,190,107)' : 'color: red; font-weight: 700;'">
<!-- DroneInDockEnum[deviceInfo.dock.basic_osd?.drone_in_dock] -->
- {{ deviceInfo.device ? EModeText[deviceInfo.device?.mode_code] : (deviceInfo.dock.basic_osd?.drone_in_dock === 1) ? '舱内关机' : EModeText[EModeCode.Disconnected]
+ {{ deviceInfo.device ? EModeText[deviceInfo.device?.mode_code] : (deviceInfo.dock.basic_osd?.drone_in_dock
+ === 1) ? '舱内关机' : EModeText[EModeCode.Disconnected]
}}</a-col>
<a-col span="15">
- <div style="width:100%;padding:0 5px;background-color: #5d5f61;color: #fff;font-size: 10px;">{{deviceInfo.device?.mode_code == 14 || !deviceInfo.device ? 'N/A' : '当前正常'}}</div>
+ <div style="width:100%;padding:0 5px;background-color: #5d5f61;color: #fff;font-size: 10px;">
+ {{ deviceInfo.device?.mode_code == 14 || !deviceInfo.device ? 'N/A' : '当前正常' }}</div>
</a-col>
</a-row>
<a-row align="middle" justify="center">
@@ -457,10 +477,11 @@
class="flex-display flex-justify-center mt5 mb5">当前设备已关机，无法进行直播</div>
</a-col>
</a-row>
- <a-row class="p5" v-if="deviceInfo.device?.mode_code != 14 && deviceInfo.device" align="middle" justify="space-between">
+ <a-row class="p5" v-if="deviceInfo.device?.mode_code != 14 && deviceInfo.device" align="middle"
+ justify="space-between">
<a-col span="11">
- <a-button :class="[aircrafIndex === 0 ? 'active-color' : 'unactive-color']" class="width-100" type="primary" size="small"
- @click="openAircra(0)">
+ <a-button :class="[aircrafIndex === 0 ? 'active-color' : 'unactive-color']" class="width-100" type="primary"
+ size="small" @click="openAircra(0)">
飞行相机
</a-button>
</a-col>
@@ -740,10 +761,10 @@
import pin from '/@/assets/icons/pin-2d8cf0.svg'
import M30 from '/@/assets/icons/m30.png'
import {
- BorderOutlined, LineOutlined, CloseOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined,
+ BorderOutlined, LineOutlined, ControlOutlined, TrademarkOutlined, ArrowDownOutlined,
ThunderboltOutlined, SignalFilled, GlobalOutlined, HistoryOutlined, CloudUploadOutlined, RocketOutlined,
FieldTimeOutlined, CloudOutlined, CloudFilled, FolderOpenOutlined, RobotFilled, ArrowUpOutlined, CarryOutOutlined,
- DesktopOutlined
+ DesktopOutlined, CloseOutlined
} from '@ant-design/icons-vue'
import { EDeviceTypeName } from '../types'
import DockControlPanel from './g-map/DockControlPanel.vue'
@@ -751,6 +772,7 @@
import DroneControlPanel from './g-map/DroneControlPanel.vue'
import { useConnectMqtt } from './g-map/use-connect-mqtt'
import Cesium from './cesiumMap/cesium.vue'
+import { convertTimestampToDate } from '/@/utils/time'
export default defineComponent({
components: {
BorderOutlined,
@@ -774,7 +796,7 @@
DroneControlPanel,
CarryOutOutlined,
RocketOutlined,
- DesktopOutlined
+ DesktopOutlined,
},
name: 'GMap',
props: {},
@@ -1431,7 +1453,8 @@
flyTimeout,
aircrafIndex,
airPortOption,
- controlStatus
+ controlStatus,
+ convertTimestampToDate
}
}
})
@@ -1475,6 +1498,7 @@
display: none;
}
}
+
&:deep(.ant-btn > .anticon + span, .ant-btn > span + .anticon, .ant-btn > .anticon + span, .ant-btn > span + .anticon) {
margin-left: 5px !important;
}
@@ -1568,4 +1592,18 @@
position: absolute;
min-height: 2px;
border-radius: 2px;
-}</style>
+}
+.task_wrapper {
+ display: flex;
+ align-items: center;
+ font-size: 12px;
+ .task_content {
+ background-color: #19be6b;
+ padding: 2px 4px;
+ }
+ .task_title {
+ margin-left: 5px;
+ font-size: 14px;
+ }
+}
+</style>
--
Gitblit v1.9.3