From 980017c9508f8b8449e773d8913b3b407f0a3416 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 18 Apr 2025 08:44:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/CurrentTaskDetails/TaskDetailsLeft.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
index 812bd86..861e33f 100644
--- a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
+++ b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
@@ -11,8 +11,8 @@
{{ item.name }}相机
</div>
<div class="multiCol">
- <div @click="faceToCenter">云台回中</div>
- <div @click="faceToDown">云台朝下</div>
+ <div @click="ptzResetMode(0)">云台回中</div>
+ <div @click="ptzResetMode(1)">云台朝下</div>
</div>
<el-select class="qualityChange" v-model="lineQuality" @change="qualityChange">
<el-option v-for="item in qualityList" :key="item.id" :label="item.name" :value="item.id" />
@@ -30,8 +30,9 @@
<el-slider
v-model="cameraParams.zoom_factor"
vertical
- :max="cameraParams.camera_type === 'ir' ? 20 : 50"
- @input="sliderChange"
+ :min="cameraParams.camera_type === 'ir' ? 2 : 0"
+ :max="cameraParams.camera_type === 'ir' ? 200 : 200"
+ @change="sliderChange"
/>
</div>
</div>
@@ -39,7 +40,7 @@
<script setup>
import EventBus from '@/event-bus'
-import { callPhotoAndVideoCmd, cameraParamsChangeApi } from '@/api/payload'
+import { callPhotoAndVideoCmd, cameraParamsChangeApi, ptzResetModeApi } from '@/api/payload'
import { ElMessage } from 'element-plus'
import { throttle } from 'lodash'
@@ -65,9 +66,9 @@
{ name: '超清', id: 4 },
]
-function faceToCenter() {}
-
-function faceToDown() {}
+function ptzResetMode(resetMode) {
+ ptzResetModeApi({ sn: dockSn.value, resetMode })
+}
// 倍率调整
function sliderChange(val) {
@@ -82,9 +83,11 @@
// 修改相机参数
function cameraParamsChange() {
+ const { camera_type, zoom_factor} = cameraParams.value
cameraParamsChangeApi({
sn: dockSn.value,
...cameraParams.value,
+ zoom_factor: camera_type === 'wide' ? undefined : zoom_factor,
})
}
@@ -97,7 +100,7 @@
cameraParams.value.zoom_factor = 5
}
if (row.key === 'ir') {
- cameraParams.value.zoom_factor = 0
+ cameraParams.value.zoom_factor = 2
}
cameraParamsChange()
}
--
Gitblit v1.9.3