From 2c2bc8614c8ea0ce386369eb4924da1e6aa052d1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 27 Sep 2023 09:35:57 +0800
Subject: [PATCH] 添加环境配置区分
---
src/components/GMap.vue | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 28 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 77351a9..8d32862 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -169,11 +169,12 @@
</div>
</div>
<!-- 机场OSD -->
- <div class="osd-panel fz12" v-if="osdVisible.visible && osdVisible.is_dock">
+ <!-- && 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"
style="border-bottom: 1px solid #515151; height: 10%;">
<span>{{ osdVisible.gateway_callsign }}</span>
- <span><a style="color: white;" @click="() => osdVisible.visible = false">
+ <span><a style="color: white;" @click="closeOsdWindow">
<CloseOutlined />
</a></span>
</div>
@@ -360,20 +361,20 @@
</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)">
+ @click="openFlySetting">
操作
</a-button>
</a-col>
</a-row>
<!-- 机场控制面板 -->
<DockControlPanel v-if="dockControlPanelVisible" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo"
- @close-control-panel="onCloseControlPanel">
+ @close-control-panel="closeOperate">
</DockControlPanel>
</div>
</div>
<a-row class="p5" v-if="showMonitor" justify="center" align="middle">
<!-- <a-spin :spinning="spinning"> -->
- <Jessibuca v-if="airPortUrl" :videoUrl="airPortUrl" width="100%" height="300px" />
+ <Jessibuca v-if="airPortUrl" @timeout="airTimeout" :videoUrl="airPortUrl" width="100%" height="300px" />
<!-- </a-spin> -->
</a-row>
<!-- 飞机-->
@@ -399,10 +400,16 @@
<a-row align="middle" justify="center">
<a-col span="24"> <div v-if="deviceInfo.device?.mode_code == 14 || !deviceInfo.device" 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-row class="p5" align="middle" justify="space-between">
+ <a-col span="11">
<a-button :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[showAircraft?'active-color':'unactive-color']" class="width-100" type="primary" size="small" @click="openAircra">
飞行控制
+ </a-button>
+ </a-col>
+ <a-col span="11">
+ <a-button :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary" size="small"
+ @click="openDeviceSetting">
+ 操作
</a-button>
</a-col>
</a-row>
@@ -411,7 +418,7 @@
<!-- 飞机直播 -->
<a-row class="p5" v-if="showAircraft">
<!-- <a-spin :spinning="spinning"> -->
- <Jessibuca v-if="aircraftUrl" :videoUrl="aircraftUrl" width="100%" height="300px" />
+ <Jessibuca v-if="aircraftUrl" @timeout="flyTimeout" :videoUrl="aircraftUrl" width="100%" height="300px" />
<!-- </a-spin> -->
</a-row>
<!-- 飞机图标信息 -->
@@ -621,7 +628,7 @@
</div>
</div>
<!-- 飞行指令 -->
- <DroneControlPanel :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
+ <DroneControlPanel v-model="openDroneControl" :sn="osdVisible.gateway_sn" :deviceInfo="deviceInfo" :payloads="osdVisible.payloads">
</DroneControlPanel>
</div>
</div>
@@ -703,13 +710,13 @@
label: string,
more?: any
}
+ // 打开飞行控制
+ const openDroneControl = ref(false)
const root = getRoot()
// 监控显示
const showMonitor = ref(false)
// 操作显示
const showOption = ref(false)
- // 飞行控制显示
- const showFly = ref(false)
const mouseMode = ref(false)
const store = useMyStore()
// 机场直播地址
@@ -725,7 +732,6 @@
// 视频列表选择值
const videoList = ref()
const videoIndex = ref(0)
- // 机场加载值
// 飞机视频播放地址
const aircraftUrl = ref('')
@@ -780,9 +786,7 @@
const drawVisible = computed(() => {
return store.state.drawVisible
})
- const osdVisible = computed(() => {
- return store.state.osdVisible
- })
+ const osdVisible = computed(() => JSON.parse(JSON.stringify(store.state.osdVisible)))
const sn = computed(() => {
return store.state.hmsInfoDetailSn
})
@@ -792,6 +796,12 @@
return val
}
})
+
+ // 关闭窗口
+ const closeOsdWindow = () => {
+ store.commit('SET_OSD_VISIBLE_INFO', false)
+ }
+
// 打开监控权限
const openMonitor = () => {
showMonitor.value = !showMonitor.value
@@ -817,7 +827,6 @@
videoList.value = []
droneIndex.value = 0
cameraIndex.value = 0
- console.log(deviceInfo, 'deviceInfo', sn.value)
await getLiveCapacity({ id: store.state.common.projectId })
.then(res => {
if (res.code === 0) {
@@ -886,7 +895,6 @@
}
})
aircraSelected.value = aircraftList.value[0].value
- console.log(aircraftList.value, 'aircraftList.value')
flyOnStart()
} else {
showAircraft.value = false
@@ -898,8 +906,24 @@
message.error(error)
})
}
+ // 机场视频超时说明可能直播被关闭需要重新开启直播
+ const airTimeout = () => {
+ try {
+ onStart()
+ } catch (e) {
+ onClose()
+ }
+ }
+ const flyTimeout = () => {
+ try {
+ flyOnStart()
+ } catch (e) {
+ closeFly()
+ }
+ }
// 设备开始播放
const onStart = async () => {
+ airPortUrl.value = ''
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
@@ -968,6 +992,16 @@
aircraftList.value = []
aircraSelected.value = ''
}
+ // 打开机场操作
+ const openFlySetting = () => {
+ openDroneControl.value = false
+ setDockControlPanelVisible(true)
+ }
+ // 打开无人机操作
+ const openDeviceSetting = () => {
+ setDockControlPanelVisible(false)
+ openDroneControl.value = !openDroneControl.value
+ }
watch(() => store.state.deviceStatusEvent,
data => {
if (Object.keys(data.deviceOnline).length !== 0) {
@@ -975,11 +1009,6 @@
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 = {}
}
},
@@ -987,7 +1016,6 @@
deep: true
}
)
-
watch(() => store.state.deviceState, data => {
if (data.currentType === EDeviceTypeName.Gateway && data.gatewayInfo[data.currentSn]) {
if (osdVisible.value.visible && osdVisible.value.gateway_sn !== '') {
@@ -1006,9 +1034,24 @@
}
}
}, {
- deep: true
+ deep: true,
})
-
+ watch(() => osdVisible.value, (data, oldData) => {
+ showMonitor.value = false
+ aircraftUrl.value = ''
+ showAircraft.value = false
+ aircraftList.value = []
+ aircraSelected.value = ''
+ airPortUrl.value = ''
+ droneList.value = []
+ if (deviceInfo.dock.basic_osd?.mode_code === 2) {
+ onCloseControlPanel(oldData.gateway_sn)
+ } else {
+ setDockControlPanelVisible(false)
+ }
+ }, {
+ deep: true,
+ })
watch(
() => store.state.wsEvent,
newData => {
@@ -1075,7 +1118,14 @@
setDockControlPanelVisible,
onCloseControlPanel,
} = useDockControl()
-
+ // 关闭设备控制方法
+ const closeOperate = (sn:string) => {
+ if (deviceInfo.dock.basic_osd?.mode_code === 2) {
+ onCloseControlPanel(sn)
+ } else {
+ setDockControlPanelVisible(false)
+ }
+ }
// 连接或断开drc
useConnectMqtt()
@@ -1264,7 +1314,6 @@
sn,
showMonitor,
showOption,
- showFly,
airPortUrl,
openMonitor,
droneIndex,
@@ -1274,6 +1323,13 @@
aircraftList,
aircraSelected,
selectChange,
+ closeOperate,
+ closeOsdWindow,
+ openDroneControl,
+ openFlySetting,
+ openDeviceSetting,
+ airTimeout,
+ flyTimeout
}
}
})
@@ -1400,4 +1456,5 @@
position: absolute;
min-height: 2px;
border-radius: 2px;
-}</style>
+}
+</style>
--
Gitblit v1.9.3