Explorar el Código

fix(photography): 修复相机焦距数据处理逻辑

- 移除不必要的条件判断,统一处理camera_focal_distance字段
- 在控制台日志中添加完整的拍摄参数对象输出
- 确保相机焦距数值在数据传输时被正确转换为数字类型
panqiuyao hace 2 semanas
padre
commit
8368e7094a

+ 19 - 0
frontend/src/views/Photography/check.vue

@@ -319,6 +319,25 @@ function takePictures() {
   if (clientStore.isClient) {
     loading.value = true;
     console.log('takePictures');
+    console.log({
+      camera_height: Number(editData.value.editRowData.camera_height),
+      camera_angle:  Number(editData.value.editRowData.camera_angle),
+      led_switch:editData.value.editRowData.led_switch,
+      id:0,
+      mode_type:editData.value.editRowData.mode_type,
+      turntable_position:Number(editData.value.editRowData.turntable_position),
+      action_name:editData.value.editRowData.action_name || '测试',
+      turntable_angle: Number(editData.value.editRowData.turntable_angle),
+      shoe_upturn: Number(editData.value.editRowData.shoe_upturn),
+      camera_focal_distance: Number(editData.value.editRowData.camera_focal_distance),
+      action_index:1,
+      number_focus:0,
+      take_picture:true,
+      pre_delay:0,
+      after_delay:0,
+      point_name:editData.value.editRowData.point_name || currentPointName.value  || 'A',
+      is_move_device:editData.value.editRowData.is_move_device
+    })
     hideVideo(currentPointName.value).then(() => {
       socketStore.sendMessage({
         type: 'run_mcu_single',

+ 1 - 1
frontend/src/views/Photography/components/editRow.vue

@@ -405,7 +405,7 @@ function testShoesFlip(){
         pre_delay:0,
         after_delay:0,
         // 相机焦段距离(可选字段)
-        camera_focal_distance: hasCameraFocal.value ? Number(editRowData.value.camera_focal_distance || 0) : undefined,
+        camera_focal_distance:Number(editRowData.value.camera_focal_distance || 0),
         // 多相机模式参数
         point_name: isMultiCameraMode.value ? (editRowData.value.point_name || 'A') : undefined,
         is_move_device: isMultiCameraMode.value ? editRowData.value.is_move_device : undefined,

+ 1 - 0
frontend/src/views/Photography/mixin/usePhotography.ts

@@ -371,6 +371,7 @@ export default function usePhotography() {
             action_name: data.action_name || '测试',
             turntable_angle: Number(data.turntable_angle),
             shoe_upturn: Number(data.shoe_upturn),
+            camera_focal_distance: Number(data.camera_focal_distance),
             action_index: 1,
             number_focus: 0,
             take_picture: false,