From e955dbbfb837ad409e41a663e1e894d8fb583f60 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Fri, 13 Oct 2023 10:06:13 +0800
Subject: [PATCH] 修改视频关闭逻辑、优化弹窗消失的效果
---
src/components/GMap.vue | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index a7661b5..aeb70e9 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -443,8 +443,9 @@
<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: red; font-weight: 700;' : 'color: rgb(25,190,107)'">
- {{ !deviceInfo.device ? EModeText[EModeCode.Disconnected] : EModeText[deviceInfo.device?.mode_code]
+ :style="deviceInfo.device || deviceInfo.device?.mode_code !== EModeCode.Disconnected ? 'color: rgb(25,190,107)' : deviceInfo.dock.basic_osd?.drone_in_dock === 0 ?'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]
}}</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>
@@ -869,6 +870,13 @@
// 关闭窗口
const closeOsdWindow = () => {
store.commit('SET_OSD_VISIBLE_INFO', false)
+ showAircraft.value = false
+ aircrafIndex.value = -1
+ aircraftUrl.value = ''
+ showMonitor.value = false
+ airPortUrl.value = ''
+ airPortOption.value = false
+ showMonitor.value = false
}
// 打开监控权限
@@ -877,7 +885,8 @@
if (showMonitor.value) {
loadVideo()
} else {
- onClose()
+ airPortUrl.value = ''
+ // onClose()
}
}
// 打开飞机监控
@@ -893,7 +902,8 @@
if (showAircraft.value) {
loadDroneVideo(type)
} else {
- closeFly()
+ aircraftUrl.value = ''
+ // closeFly()
}
}
// 加载该设备的视频信息
@@ -941,6 +951,8 @@
}
})
.catch(error => {
+ showMonitor.value = false
+ airPortUrl.value = ''
message.error(error)
})
}
@@ -978,6 +990,8 @@
}
})
.catch(error => {
+ showAircraft.value = false
+ aircrafIndex.value = -1
message.error(error)
})
}
@@ -986,14 +1000,16 @@
try {
onStart()
} catch (e) {
- onClose()
+ airPortUrl.value = ''
+ // onClose()
}
}
const flyTimeout = () => {
try {
flyOnStart()
} catch (e) {
- closeFly()
+ aircraftUrl.value = ''
+ // closeFly()
}
}
// 设备开始播放
@@ -1038,7 +1054,6 @@
const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
const streamId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '-' + aircraSelected.value + '-' + 'normal-0'
const liveURL = config.rtmpURL + streamId
- console.log('飞机设备播放事件触发')
await startLivestream({
url: liveURL,
video_id: videoId,
@@ -1202,6 +1217,7 @@
} = useDockControl()
// 关闭设备控制方法
const closeOperate = (sn: string) => {
+ airPortOption.value = false
if (deviceInfo.dock.basic_osd?.mode_code === 2) {
onCloseControlPanel(sn)
} else {
--
Gitblit v1.9.3