Merge branch 'master' into 重构/1078

# Conflicts: # src/main/resources/application.yml
2025-06-03 17:21:21 +08:00
parent 1420fcfcd0 227239f7f7
commit d15307533a
25 changed files with 138 additions and 86 deletions
--- a/web/src/views/dialog/devicePlayer.vue
+++ b/web/src/views/dialog/devicePlayer.vue
@@ -298,7 +298,7 @@
                  </div>
                </div>
              </div>
-              <div style="text-align: left">
+              <div style="text-align: left" v-if="tabActiveName === 'control'">
                <el-select
                  v-model="ptzMethod"
                  style="width: 100%"