From f118e8b245f740d07f55520bfffac9aefc78a012 Mon Sep 17 00:00:00 2001
From: g82tt <snow82@vip.qq.com>
Date: Sun, 17 May 2026 14:21:10 +0800
Subject: [PATCH] =?UTF-8?q?V4=E4=BC=98=E5=8C=96:=20=E9=A2=84=E8=A7=88+?=
 =?UTF-8?q?=E4=BA=91=E5=8F=B0=E5=90=88=E5=B9=B6=E4=B8=BA=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=20=E8=A7=86=E9=A2=91=E5=B7=A6/?=
 =?UTF-8?q?=E6=96=B9=E5=90=91=E9=94=AE=E5=8F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/device_manager/base_device.vue  | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/web.vite/src/views/warehouse/device_manager/base_device.vue b/web.vite/src/views/warehouse/device_manager/base_device.vue
index 0ba1c80..b63add0 100644
--- a/web.vite/src/views/warehouse/device_manager/base_device.vue
+++ b/web.vite/src/views/warehouse/device_manager/base_device.vue
@@ -24,31 +24,31 @@
         </template>
     </view-grid>
 
-    <!-- 实时预览 -->
+    <!-- 实时预览 + 云台控制 -->
     <vol-box :lazy="true" v-model="previewVisible" title="实时预览" :width="960" :padding="10">
-        <div style="background:#000;min-height:400px;display:flex;align-items:center;justify-content:center">
-            <div v-if="!wsFlv" style="color:#fff">{{ loading ? '加载中...' : '无法获取流地址' }}</div>
-            <video v-else ref="playerRef" :src="wsFlv" autoplay muted controls style="width:100%;height:450px" />
+        <div style="display:flex;gap:8px">
+            <div style="flex:1;background:#000;min-height:450px;display:flex;align-items:center;justify-content:center">
+                <div v-if="!wsFlv" style="color:#fff">{{ loading ? '加载中...' : '无法获取流地址' }}</div>
+                <video v-else :src="wsFlv" autoplay muted controls style="width:100%;height:450px" />
+            </div>
+            <div style="width:120px;display:flex;flex-direction:column;align-items:center;gap:4px;padding-top:60px">
+                <el-button circle @mousedown="ptzGo('up')" @mouseup="ptzStop" @mouseleave="ptzStop"><el-icon><ArrowUp /></el-icon></el-button>
+                <div style="display:flex;gap:4px">
+                    <el-button circle @mousedown="ptzGo('left')" @mouseup="ptzStop"><el-icon><ArrowLeft /></el-icon></el-button>
+                    <el-button circle type="danger" size="small" @click="ptzGo('stop')"><el-icon><Close /></el-icon></el-button>
+                    <el-button circle @mousedown="ptzGo('right')" @mouseup="ptzStop"><el-icon><ArrowRight /></el-icon></el-button>
+                </div>
+                <el-button circle @mousedown="ptzGo('down')" @mouseup="ptzStop"><el-icon><ArrowDown /></el-icon></el-button>
+                <div style="display:flex;gap:4px;margin-top:8px">
+                    <el-button circle size="small" @mousedown="ptzGo('zoom_in')" @mouseup="ptzStop">+</el-button>
+                    <el-button circle size="small" @mousedown="ptzGo('zoom_out')" @mouseup="ptzStop">-</el-button>
+                </div>
+            </div>
         </div>
         <template #footer><el-button size="small" @click="previewVisible=false">关闭</el-button></template>
     </vol-box>
 
-    <!-- 云台控制 -->
-    <vol-box :lazy="true" v-model="ptzVisible" title="云台控制" :width="320" :padding="10">
-        <div style="display:flex;flex-direction:column;align-items:center;gap:4px">
-            <el-button circle @mousedown="ptzGo('up')" @mouseup="ptzStop" @mouseleave="ptzStop"><el-icon><ArrowUp /></el-icon></el-button>
-            <div style="display:flex;gap:8px">
-                <el-button circle @mousedown="ptzGo('left')" @mouseup="ptzStop"><el-icon><ArrowLeft /></el-icon></el-button>
-                <el-button circle type="danger" @click="ptzGo('stop')"><el-icon><Close /></el-icon></el-button>
-                <el-button circle @mousedown="ptzGo('right')" @mouseup="ptzStop"><el-icon><ArrowRight /></el-icon></el-button>
-            </div>
-            <el-button circle @mousedown="ptzGo('down')" @mouseup="ptzStop"><el-icon><ArrowDown /></el-icon></el-button>
-            <div style="display:flex;gap:8px;margin-top:8px">
-                <el-button circle @mousedown="ptzGo('zoom_in')" @mouseup="ptzStop">+</el-button>
-                <el-button circle @mousedown="ptzGo('zoom_out')" @mouseup="ptzStop">-</el-button>
-            </div>
-        </div>
-    </vol-box>
+
 
     <!-- 实时数据 -->
     <vol-box :lazy="true" v-model="realtimeVisible" title="实时数据" :width="600" :padding="10">
@@ -87,7 +87,7 @@
 
     //── 对话框状态 ──
     const curDev = ref(null);
-    const previewVisible = ref(false), ptzVisible = ref(false);
+    const previewVisible = ref(false);
     const realtimeVisible = ref(false), controlVisible = ref(false);
     const wsFlv = ref(null), loading = ref(false);
     const realtimeValues = ref([]), realtimeLoading = ref(false);
@@ -149,11 +149,6 @@
                                 onClick={($e) => openPreview(row)}>
                                 预览
                             </el-button>
-                            <el-button size="small" plain
-                                style="height:26px;padding:0 8px !important;margin-left:4px"
-                                onClick={($e) => { curDev.value = row; ptzVisible.value = true }}>
-                                云台
-                            </el-button>
                         </div>
                     );
                 }