From dfac8531d4ed65183ebffcbc7f88aea16f6ac64b Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 18 Apr 2025 19:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard

---
 src/components/CurrentTaskDetails/TaskDetailsLeft.vue |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
index 1f80069..0e39eca 100644
--- a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
+++ b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
@@ -143,7 +143,7 @@
 
 // 修改相机参数
 function cameraParamsChange() {
-	const { camera_type, zoom_factor} = cameraParams.value
+	const { camera_type, zoom_factor } = cameraParams.value
 	cameraParamsChangeApi({
 		sn: dockSn.value,
 		...cameraParams.value,
@@ -176,7 +176,7 @@
 	const msg = isRecording.value ? '停止录像' : '开始录像'
 	const emitType = isRecording.value ? 'controlPanel-timeStop' : 'controlPanel-timeStart'
 
-	callPhotoAndVideoCmd(droneSn.value, type).then(res => {
+	callPhotoAndVideoCmd(dockSn.value, type).then(res => {
 		ElMessage.success(msg)
 		EventBus.emit(emitType)
 		isRecording.value = !isRecording.value
@@ -185,8 +185,11 @@
 
 // 拍照
 function takePictures() {
+	if (isRecording.value) {
+		return ElMessage.warning('请先结束录像')
+	}
 	// photo拍照,video_start开始录像,video_stop结束录像
-	callPhotoAndVideoCmd(droneSn.value, 'photo').then(res => {
+	callPhotoAndVideoCmd(dockSn.value, 'photo').then(res => {
 		ElMessage.success('拍照成功')
 	})
 }

--
Gitblit v1.9.3