From b3de47a55bb968797abb16d48cd9b4522a11a7f1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Fri, 22 Sep 2023 17:07:12 +0800
Subject: [PATCH] 视频问题部分修改提交
---
src/components/GMap.vue | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 4e8c879..77351a9 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -817,19 +817,19 @@
videoList.value = []
droneIndex.value = 0
cameraIndex.value = 0
- await getLiveCapacity({})
+ console.log(deviceInfo, 'deviceInfo', sn.value)
+ await getLiveCapacity({ id: store.state.common.projectId })
.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 airport = res.data.find(v => v.sn === sn.value)
const temp: Array<SelectOption> = []
- if (resData) {
- resData.forEach((ele: any) => {
- temp.push({ label: ele.name, value: ele.sn, more: ele.cameras_list })
- })
+ if (airport) {
+ temp.push({ label: airport.name, value: airport.sn, more: airport.cameras_list })
// 设备列表
droneList.value = temp.filter(v => v.value === sn.value)
// 设备直播处理
@@ -862,7 +862,7 @@
// 加载无人机的视频信息
const loadDroneVideo = async () => {
aircraftList.value = []
- await getLiveCapacity({})
+ await getLiveCapacity({ id: store.state.common.projectId })
.then(res => {
if (res.code === 0) {
if (res.data === null) {
@@ -870,29 +870,27 @@
return
}
const resData: Array<[]> = res.data
+ const drone = res.data.find(v => v.sn === deviceInfo.dock.basic_osd.sub_device?.device_sn)
const temp: Array<SelectOption> = []
- if (resData) {
- resData.forEach((ele: any) => {
- temp.push({ label: ele.name, value: ele.sn, more: ele.cameras_list })
+ if (drone) {
+ temp.push({ label: drone.name, value: drone.sn, more: drone.cameras_list })
+ } // 无人机列表
+ const airList = temp.filter(v => v.value === deviceInfo.dock.basic_osd?.sub_device?.device_sn)
+ // 无人机设备处理
+ if (airList[0].more && airList[0].more.length > 0) {
+ aircraftList.value = airList[0].more.map(v => {
+ return {
+ label: v.name,
+ value: v.index,
+ vadeosList: v.videos_list
+ }
})
- // 无人机列表
- const airList = temp.filter(v => v.value === deviceInfo.dock.basic_osd?.sub_device?.device_sn)
- // 无人机设备处理
- if (airList[0].more && airList[0].more.length > 0) {
- aircraftList.value = airList[0].more.map(v => {
- return {
- label: v.name,
- value: v.index,
- vadeosList: v.videos_list
- }
- })
- aircraSelected.value = aircraftList.value[0].value
- console.log(aircraftList.value, 'aircraftList.value')
- flyOnStart()
- } else {
- showAircraft.value = false
- message.error('该无人机暂无直播设备开启')
- }
+ aircraSelected.value = aircraftList.value[0].value
+ console.log(aircraftList.value, 'aircraftList.value')
+ flyOnStart()
+ } else {
+ showAircraft.value = false
+ message.error('该无人机暂无直播设备开启')
}
}
})
--
Gitblit v1.9.3