From 6264e7823df52fdf738ff6aaad8e8731e7997363 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 09 Jun 2025 15:53:29 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/device/components/DockControlPanel.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/device/components/DockControlPanel.vue b/src/views/device/components/DockControlPanel.vue
index c56b9a2..6a8d389 100644
--- a/src/views/device/components/DockControlPanel.vue
+++ b/src/views/device/components/DockControlPanel.vue
@@ -26,7 +26,7 @@
</div>
</div>
</div>
-
+
<el-divider v-if="deviceInfo">无人机设置</el-divider>
<div class="control-cmd-box" v-for="(item, index) in cameras">
<div>
@@ -54,7 +54,7 @@
</el-form-item>
<el-form-item label="照片存储设置" v-if="cameraModeValue == 0">
- <el-select v-model="item.photo_storage_settings" collapse-tags @change="photoStorageTypeChang($event, item)"
+ <el-select v-model="photo_storage_settings" collapse-tags @change="photoStorageTypeChang($event, item)"
multiple placeholder="请选择">
<el-option v-for="item in photoStorageType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="视频存储设置" v-if="cameraModeValue == 1">
- <el-select v-model="item.video_storage_settings" collapse-tags @change="videoStorageTypeChang($event, item)"
+ <el-select v-model="video_storage_settings" collapse-tags @change="videoStorageTypeChang($event, item)"
multiple placeholder="请选择">
<el-option v-for="item in photoStorageType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -93,6 +93,8 @@
const valueStyle = ref(0)
const cameraModeValue = ref(0)
const videoValue = ref("zoom")
+const photo_storage_settings = ref([])
+const video_storage_settings = ref([])
// 定义一个数据videoList
const videoList = reactive([])
@@ -233,6 +235,8 @@
// 判断cameras列表长度是否为0，如果为0，则不执行后续操作
if (cameras.length > 0) {
cameraModeValue.value = cameras[0].camera_mode
+ photo_storage_settings.value = cameras[0]?.photo_storage_settings ?? [];
+ video_storage_settings.value = cameras[0]?.video_storage_settings ?? [];
}
deviceInfo = ref(value.deviceInfo[props.deviceInfo.child_sn])
updateDeviceCmdInfoByOsd(cmdList.value, devices)
--
Gitblit v1.9.3