diff --git a/agv_app/static/css/style.css b/agv_app/static/css/style.css index ad3eda8..3bbc7f6 100644 --- a/agv_app/static/css/style.css +++ b/agv_app/static/css/style.css @@ -912,3 +912,11 @@ a:hover { text-decoration: underline; } 0%, 100% { opacity: 1; } 50% { opacity: 0.3; } } + +/* ========== 运行页双摄像头 ========== */ +.camera-dual { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 16px; + margin-top: 12px; +} diff --git a/agv_app/static/js/running.js b/agv_app/static/js/running.js index aa01478..eef4927 100644 --- a/agv_app/static/js/running.js +++ b/agv_app/static/js/running.js @@ -10,7 +10,8 @@ createApp({ progress: 0, tasks: [], report: null, - previewUrl: API + '/api/camera/preview', + agvPreviewUrl: API + '/api/camera/preview', + armPreviewUrl: API + '/api/camera/arm_refresh', polling: null, logs: [], showQrModal: false, @@ -123,7 +124,10 @@ createApp({ body: JSON.stringify({ qr: 'SKIP' }) }) }, - onPreviewError(e) { + onAgvPreviewError(e) { + e.target.style.display = 'none' + }, + onArmPreviewError(e) { e.target.style.display = 'none' } } diff --git a/agv_app/templates/running.html b/agv_app/templates/running.html index 5536159..0ea37a9 100644 --- a/agv_app/templates/running.html +++ b/agv_app/templates/running.html @@ -85,8 +85,15 @@

📷 摄像头预览

-
- +
+
+
🎥 AGV 摄像头
+ +
+
+
🦾 机械臂摄像头
+ +