From 477172f3af1f073d24e861df52ff9f2474d43296 Mon Sep 17 00:00:00 2001
From: T0n0T <823478402@qq.com>
Date: Fri, 15 May 2026 16:13:04 +0800
Subject: [PATCH 1/2] fix: add WebSocket sub_filter for mp4_record and fix
 ptzCruising preset label

- Add ws:// and wss:// sub_filter entries for mp4_record in nginx template
  to allow WebSocket playback of cloud recordings through nginx proxy
- Fix ptzCruising dropdown preset label to fallback to presetId when
  presetName is empty, preventing blank option display
---
 docker/nginx/templates/nginx.conf.template         | 4 ++++
 web/src/views/common/channelPlayer/ptzCruising.vue | 2 +-
 web/src/views/common/ptzCruising.vue               | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/nginx/templates/nginx.conf.template b/docker/nginx/templates/nginx.conf.template
index cf0de139e..f0bd4897d 100644
--- a/docker/nginx/templates/nginx.conf.template
+++ b/docker/nginx/templates/nginx.conf.template
@@ -34,6 +34,10 @@ server {
         sub_filter "http://$original_host:80/mp4_record" "mp4_record";
         sub_filter "https://$original_host/mp4_record" "mp4_record";
         sub_filter "https://$original_host:443/mp4_record" "mp4_record";
+        sub_filter "ws://$original_host/mp4_record" "mp4_record";
+        sub_filter "ws://$original_host:80/mp4_record" "mp4_record";
+        sub_filter "wss://$original_host/mp4_record" "mp4_record";
+        sub_filter "wss://$original_host:443/mp4_record" "mp4_record";
         
         # 设置为off表示替换所有匹配项，而不仅仅是第一个
         sub_filter_once off;
diff --git a/web/src/views/common/channelPlayer/ptzCruising.vue b/web/src/views/common/channelPlayer/ptzCruising.vue
index bff51a4bb..532f106e4 100644
--- a/web/src/views/common/channelPlayer/ptzCruising.vue
+++ b/web/src/views/common/channelPlayer/ptzCruising.vue
@@ -30,7 +30,7 @@
           <el-option
             v-for="item in allPresetList"
             :key="item.presetId"
-            :label="item.presetName"
+            :label="item.presetName ? item.presetName : item.presetId"
             :value="item"
           />
         </el-select>
diff --git a/web/src/views/common/ptzCruising.vue b/web/src/views/common/ptzCruising.vue
index e48c14aa3..21cfd990f 100644
--- a/web/src/views/common/ptzCruising.vue
+++ b/web/src/views/common/ptzCruising.vue
@@ -30,7 +30,7 @@
           <el-option
             v-for="item in allPresetList"
             :key="item.presetId"
-            :label="item.presetName"
+            :label="item.presetName ? item.presetName : item.presetId"
             :value="item"
           />
         </el-select>

From bc3cde6d52afa15a46d11e00a90e89ac49b400c6 Mon Sep 17 00:00:00 2001
From: T0n0T <823478402@qq.com>
Date: Fri, 15 May 2026 18:09:05 +0800
Subject: [PATCH 2/2] fix: add value-key for el-select to display preset label
 correctly

When presetName is empty, the el-select trigger area failed to show
the fallback presetId without value-key being set explicitly.
---
 web/src/views/common/channelPlayer/ptzCruising.vue | 2 +-
 web/src/views/common/ptzCruising.vue               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/views/common/channelPlayer/ptzCruising.vue b/web/src/views/common/channelPlayer/ptzCruising.vue
index 532f106e4..b0f6f3ead 100644
--- a/web/src/views/common/channelPlayer/ptzCruising.vue
+++ b/web/src/views/common/channelPlayer/ptzCruising.vue
@@ -26,7 +26,7 @@
 
     <el-form v-if="selectPresetVisible" size="mini" :inline="true">
       <el-form-item>
-        <el-select v-model="selectPreset" placeholder="请选择预置点">
+        <el-select v-model="selectPreset" value-key="presetId" placeholder="请选择预置点">
           <el-option
             v-for="item in allPresetList"
             :key="item.presetId"
diff --git a/web/src/views/common/ptzCruising.vue b/web/src/views/common/ptzCruising.vue
index 21cfd990f..8c73aa55b 100644
--- a/web/src/views/common/ptzCruising.vue
+++ b/web/src/views/common/ptzCruising.vue
@@ -26,7 +26,7 @@
 
     <el-form v-if="selectPresetVisible" size="mini" :inline="true">
       <el-form-item>
-        <el-select v-model="selectPreset" placeholder="请选择预置点">
+        <el-select v-model="selectPreset" value-key="presetId" placeholder="请选择预置点">
           <el-option
             v-for="item in allPresetList"
             :key="item.presetId"