From 42735cc9fe2ae2048213e1c6518c0123ad36fd1c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 22 Jul 2025 17:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/left-one.vue        |  2 +-
 .../modal-content/add-or-edit-marker-form.vue | 30 +++++++++++++++----
 .../modal-content/preset-setting.vue          |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/home/components/left-one.vue b/src/views/home/components/left-one.vue
index 8035b7b..409e5c4 100644
--- a/src/views/home/components/left-one.vue
+++ b/src/views/home/components/left-one.vue
@@ -86,7 +86,7 @@ import AddOrEditMarkerForm from './modal-content/add-or-edit-marker-form.vue'
 
 import FlvPlayer from '@/components/FlvPlayer/index.vue'
 const presetSettingVisible = ref(false) // 预置位配置
-const addMarkerVisible = ref(false) // 新增预置点位
+const addMarkerVisible = ref(true) // 新增预置点位
 const inspectionTaskVisible = ref(false) // 巡视任务
 const addInspectionTaskVisible = ref(false) // 新增巡视任务
 const markerInfo = ref({}) // 新增预置点位信息
diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
index 86bf9a5..accc42e 100644
--- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue
+++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
@@ -117,16 +117,25 @@
                 </n-grid>
             </n-form>
 
-            <n-flex justify="space-between" style="flex: 1; margin-top: 6px">
+            <!-- <n-flex justify="space-between" style="flex: 1; margin-top: 6px">
                 <div class="left-box" style="width: 49%">
-                    <!-- 放置video -->
+                  
                     <FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" />
                 </div>
                 <div class="right-box" style="width: 46%">
-                    <!-- 放置操控面板 -->
+                   
                     <ControlDeck :deviceToken="deviceToken" :deviceInfo="deviceInfo" />
                 </div>
-            </n-flex>
+            </n-flex> -->
+
+            <div class="video-container">
+                <div class="left-box" style="width: 49%">
+                    <FlvPlayer :cameraNode="cameraNode" :videoId="`video-3`" />
+                </div>
+                <div class="right-box" style="width: 46%">
+                    <ControlDeck :deviceToken="deviceToken" :deviceInfo="deviceInfo" />
+                </div>
+            </div>
         </div>
     </DialogModal>
 </template>
@@ -397,11 +406,12 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .add-or-edit-marker-form {
     // width: 100%;
-    // padding: 0 10px;
+    padding: 0 10px;
     display: flex;
     flex-direction: column;
-    height: 100vh;
+    height: 100%;
     overflow: auto;
+
     // 滚动条样式
     // 优化一下滚动条
     &::-webkit-scrollbar {
@@ -418,5 +428,13 @@ onBeforeUnmount(() => {
     &::-webkit-scrollbar-thumb {
         background-color: #6e90a9;
     }
+
+    .video-container {
+        margin-top: 12px;
+        flex: 1;
+
+        display: flex;
+        justify-content: space-between;
+    }
 }
 </style>
diff --git a/src/views/home/components/modal-content/preset-setting.vue b/src/views/home/components/modal-content/preset-setting.vue
index af9c54e..08e3350 100644
--- a/src/views/home/components/modal-content/preset-setting.vue
+++ b/src/views/home/components/modal-content/preset-setting.vue
@@ -12,7 +12,7 @@
             ref="planeMapContainer"
             :class="{ 'can-drag': canDrag() }"
             :style="{ height: INITIAL_HEIGHT + 'px' }"
-            style="min-height: 60vh"
+            style="min-height: 70vh"
             @mousemove="handleMouseMove"
         >
             <svg