From 60bb69f4cfc33cd0224e856afc2b00f6bc80e4d4 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 25 Sep 2023 14:24:51 +0800
Subject: [PATCH] 无人机控制区分
---
src/components/GMap.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 575a8c8..33ca752 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -399,10 +399,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 :disabled="deviceInfo.device?.mode_code == 14 || !deviceInfo.device?true:false" :class="[openDroneControl?'active-color':'unactive-color']" class="width-100" type="primary" size="small"
+ @click="openDeviceSetting">
+ 操作
</a-button>
</a-col>
</a-row>
@@ -807,12 +813,9 @@
// 打开飞机监控
const openAircra = () => {
showAircraft.value = !showAircraft.value
- setDockControlPanelVisible(false)
if (showAircraft.value) {
- openDroneControl.value = true
loadDroneVideo()
} else {
- openDroneControl.value = false
closeFly()
}
}
@@ -976,6 +979,11 @@
const openFlySetting = () => {
openDroneControl.value = false
setDockControlPanelVisible(true)
+ }
+ // 打开无人机操作
+ const openDeviceSetting = () => {
+ setDockControlPanelVisible(false)
+ openDroneControl.value = false
}
watch(() => store.state.deviceStatusEvent,
data => {
@@ -1306,7 +1314,8 @@
closeOperate,
closeOsdWindow,
openDroneControl,
- openFlySetting
+ openFlySetting,
+ openDeviceSetting
}
}
})
--
Gitblit v1.9.3