From 4eedfd1624b2700aed0a3cde1a34469b04d08759 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 10 Oct 2023 16:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/components/GMap.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 476dd41..d65f9bf 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -448,7 +448,7 @@
}}</a-col>
<a-col span="15">
<a-select :showArrow="false" v-model:value="aircraSelected" :bordered="false" :options="aircraftList"
- :placeholder="aircraftList.length == 0 || deviceInfo.device?.mode_code == 14 || !deviceInfo.device ? 'N/A' : '请选择'" :disabled="aircraftList.length == 0 ? true : false"
+ :placeholder="aircraftList.length == 0 ? 'N/A' : '请选择'" :disabled="aircraftList.length == 0 ? true : false"
size="small" style="width:100%;background-color: #5d5f61;color: #fff;" @change="selectChange"></a-select>
</a-col>
</a-row>
@@ -607,7 +607,7 @@
</a-tooltip>
</a-col>
</a-row> -->
- <!-- <a-row align="middle">
+ <a-row align="middle">
<a-col span="6" class="flex-row flex-align-center flex-justify-start">
<a-tooltip title="飞行模式">
<span>
@@ -663,7 +663,7 @@
deviceInfo.device?.vertical_speed.toFixed(2) + ' m/s' }}</span>
</a-tooltip>
</a-col>
- </a-row> -->
+ </a-row>
</div>
<!-- 飞行控制 -->
<!-- <div class="fly-control flex-display">
@@ -799,7 +799,7 @@
const showAircraft = ref(false)
// 飞机视频列表
const aircraftList = ref([])
- const aircraSelected = ref('')
+ const aircraSelected = ref(undefined)
const state = reactive({
currentType: '',
coverIndex: 0
@@ -1051,7 +1051,7 @@
})
// const videoId = deviceInfo.dock.basic_osd?.sub_device?.device_sn + '/' + aircraSelected.value + '/' + 'normal-0'
aircraftList.value = []
- aircraSelected.value = ''
+ aircraSelected.value = undefined
}
// 打开机场操作
const openFlySetting = () => {
@@ -1102,7 +1102,7 @@
aircraftUrl.value = ''
showAircraft.value = false
aircraftList.value = []
- aircraSelected.value = ''
+ aircraSelected.value = undefined
airPortUrl.value = ''
droneList.value = []
if (deviceInfo.dock.basic_osd?.mode_code === 2) {
@@ -1444,7 +1444,7 @@
background: #000;
color: #fff;
border-radius: 2px;
- opacity: 0.8;
+ // opacity: 0.8;
}
.overflow {
--
Gitblit v1.9.3