From f5494c0b9595565202f289ae53e0337f3930c6cd Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Wed, 10 Jun 2026 18:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=92=AD=E6=94=BE=E5=99=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E4=BA=91=E5=8F=B0=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/api/frontEnd.js                       |   2 +-
 web/src/views/common/playerTabs.vue           | 152 +++
 web/src/views/common/ptzControls.vue          | 233 +++++
 web/src/views/common/ptzPrecise.vue           |  65 ++
 web/src/views/common/ptzPreset.vue            | 106 +-
 web/src/views/device/channel/index.vue        |  20 +-
 .../views/device/common/playerPtzPanel.vue    | 124 +++
 web/src/views/device/common/ptzConfig.vue     | 112 +++
 .../views/device/common/ptzCruiseConfig.vue   | 200 ++++
 .../views/device/common/ptzPresetConfig.vue   | 156 +++
 web/src/views/device/common/ptzScanConfig.vue | 107 ++
 .../views/device/common/ptzSwitchConfig.vue   |  42 +
 .../views/device/common/ptzWiperConfig.vue    |  34 +
 web/src/views/dialog/devicePlayer.vue         | 946 ++++--------------
 14 files changed, 1441 insertions(+), 858 deletions(-)
 create mode 100644 web/src/views/common/playerTabs.vue
 create mode 100644 web/src/views/common/ptzControls.vue
 create mode 100644 web/src/views/common/ptzPrecise.vue
 create mode 100644 web/src/views/device/common/playerPtzPanel.vue
 create mode 100644 web/src/views/device/common/ptzConfig.vue
 create mode 100644 web/src/views/device/common/ptzCruiseConfig.vue
 create mode 100644 web/src/views/device/common/ptzPresetConfig.vue
 create mode 100644 web/src/views/device/common/ptzScanConfig.vue
 create mode 100644 web/src/views/device/common/ptzSwitchConfig.vue
 create mode 100644 web/src/views/device/common/ptzWiperConfig.vue

diff --git a/web/src/api/frontEnd.js b/web/src/api/frontEnd.js
index 47c51323a..d59ccae27 100644
--- a/web/src/api/frontEnd.js
+++ b/web/src/api/frontEnd.js
@@ -182,7 +182,7 @@ export function wiper([deviceId, channelDeviceId, command]) {
   })
 }
 
-export function ptz([deviceId, channelId, command, horizonSpeed, verticalSpeed, zoomSpeed]) {
+export function ptz({ deviceId, channelId, command, horizonSpeed, verticalSpeed, zoomSpeed }) {
   return request({
     method: 'get',
     url: `/api/front-end/ptz/${deviceId}/${channelId}`,
diff --git a/web/src/views/common/playerTabs.vue b/web/src/views/common/playerTabs.vue
new file mode 100644
index 000000000..aa15ed9bb
--- /dev/null
+++ b/web/src/views/common/playerTabs.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="player-tabs-wrapper" ref="playerWrapper">
+    <el-tabs v-if="playerCount > 1" v-model="activePlayer" type="card" :stretch="true" @tab-click="changePlayer">
+      <el-tab-pane label="Jessibuca" name="jessibuca">
+        <div v-if="activePlayer === 'jessibuca'" class="player-video-area">
+          <jessibucaPlayer
+            ref="jessibuca"
+            style="width: 100%; height: 100%;"
+            :video-url="videoUrl"
+            :has-audio="hasAudio"
+            :show-button="showButton"
+            fluent autoplay live
+          />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="WebRTC" name="webRTC">
+        <div v-if="activePlayer === 'webRTC'" class="player-video-area">
+          <rtc-player
+            ref="webRTC"
+            style="width: 100%; height: 100%;"
+            :video-url="videoUrl"
+            :has-audio="hasAudio"
+            fluent autoplay live
+          />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="h265web" name="h265web">
+        <div v-if="activePlayer === 'h265web'" class="player-video-area">
+          <h265web
+            style="width: 100%; height: 100%;"
+            ref="h265web"
+            :video-url="videoUrl"
+            :has-audio="hasAudio"
+            :show-button="showButton"
+            fluent autoplay live
+          />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+    <div v-if="playerCount <= 1" class="player-video-area">
+      <jessibucaPlayer
+        v-if="player.jessibuca"
+        ref="jessibuca"
+        style="width: 100%; height: 100%;"
+        :video-url="videoUrl"
+        :has-audio="hasAudio"
+        :show-button="showButton"
+        fluent autoplay live
+      />
+      <rtc-player
+        v-if="player.webRTC"
+        ref="webRTC"
+        style="width: 100%; height: 100%;"
+        :video-url="videoUrl"
+        :has-audio="hasAudio"
+        fluent autoplay live
+      />
+      <h265web
+        v-if="player.h265web"
+        ref="h265web"
+        style="width: 100%; height: 100%;"
+        :video-url="videoUrl"
+        :has-audio="hasAudio"
+        :show-button="showButton"
+        fluent autoplay live
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import jessibucaPlayer from './jessibuca.vue'
+import rtcPlayer from './rtcPlayer.vue'
+import h265web from './h265web.vue'
+
+export default {
+  name: 'PlayerTabs',
+  components: { jessibucaPlayer, rtcPlayer, h265web },
+  props: {
+    videoUrl: { type: String, default: '' },
+    hasAudio: { type: Boolean, default: false },
+    showButton: { type: Boolean, default: true },
+    height: { type: String, default: '' }
+  },
+  data() {
+    return {
+      activePlayer: 'jessibuca',
+      player: { jessibuca: ['ws_flv', 'wss_flv'], webRTC: ['rtc', 'rtcs'], h265web: ['ws_flv', 'wss_flv'] }
+    }
+  },
+  computed: {
+    playerCount() {
+      return Object.keys(this.player).length
+    }
+  },
+  created() {
+    if (this.playerCount === 1) {
+      this.activePlayer = Object.keys(this.player)[0]
+    }
+  },
+  methods: {
+    getUrlByStreamInfo(streamInfo) {
+      const info = streamInfo || this.streamInfo
+      if (!info) return ''
+      const src = info.transcodeStream || info
+      if (location.protocol === 'https:') {
+        return src[this.player[this.activePlayer][1]]
+      }
+      return src[this.player[this.activePlayer][0]]
+    },
+    changePlayer(tab) {
+      this.activePlayer = tab.name
+      this.$emit('player-changed', this.activePlayer)
+    },
+    play(url) {
+      this.$nextTick(() => {
+        if (this.$refs[this.activePlayer]) {
+          this.$refs[this.activePlayer].play(url)
+        }
+      })
+    },
+    stop() {
+      if (this.$refs[this.activePlayer]) {
+        this.$refs[this.activePlayer].pause()
+      }
+    },
+    pause() {
+      if (this.$refs[this.activePlayer]) {
+        this.$refs[this.activePlayer].pause()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.player-tabs-wrapper {
+  width: 100%;
+  height: 100%;
+}
+.player-tabs-wrapper .el-tabs {
+  margin-bottom: 0;
+}
+.player-tabs-wrapper .el-tabs >>> .el-tabs__header {
+  margin-bottom: 0;
+}
+.player-video-area {
+  width: 100%;
+  height: 100%;
+  background: #000;
+}
+</style>
diff --git a/web/src/views/common/ptzControls.vue b/web/src/views/common/ptzControls.vue
new file mode 100644
index 000000000..59ccb8c04
--- /dev/null
+++ b/web/src/views/common/ptzControls.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="ptz-section-inner">
+    <div class="ptz-left">
+      <div class="ptz-dpad">
+        <div class="dpad-ring"></div>
+        <button class="dpad-btn card card-up" @mousedown.prevent="$emit('ptz-move', { direction: 'up', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')">▲</button>
+        <button class="dpad-btn card card-right" @mousedown.prevent="$emit('ptz-move', { direction: 'right', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')">▶</button>
+        <button class="dpad-btn card card-down" @mousedown.prevent="$emit('ptz-move', { direction: 'down', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')">▼</button>
+        <button class="dpad-btn card card-left" @mousedown.prevent="$emit('ptz-move', { direction: 'left', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')">◀</button>
+        <button class="dpad-btn diag diag-upright" @mousedown.prevent="$emit('ptz-move', { direction: 'upright', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')"><span style="display:inline-block;transform:rotate(45deg)">▲</span></button>
+        <button class="dpad-btn diag diag-downright" @mousedown.prevent="$emit('ptz-move', { direction: 'downright', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')"><span style="display:inline-block;transform:rotate(135deg)">▲</span></button>
+        <button class="dpad-btn diag diag-downleft" @mousedown.prevent="$emit('ptz-move', { direction: 'downleft', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')"><span style="display:inline-block;transform:rotate(225deg)">▲</span></button>
+        <button class="dpad-btn diag diag-upleft" @mousedown.prevent="$emit('ptz-move', { direction: 'upleft', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')"><span style="display:inline-block;transform:rotate(-45deg)">▲</span></button>
+        <button class="dpad-btn dpad-center" title="停止" @click="$emit('ptz-stop')">⏹</button>
+      </div>
+      <div class="ptz-speed-slider">
+        <span class="ptz-speed-label">速度</span>
+        <el-slider v-model="controSpeed" :max="8" :min="1" style="flex: 1" />
+      </div>
+    </div>
+    <div class="ptz-right">
+      <div class="ptz-func-group">
+        <div class="ptz-func-row">
+          <div class="ptz-func-btn" title="变倍+" @mousedown.prevent="$emit('ptz-move', { direction: 'zoomin', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')">
+            <i class="el-icon-zoom-in" /><span>变倍+</span>
+          </div>
+          <div class="ptz-func-btn" title="变倍-" @mousedown.prevent="$emit('ptz-move', { direction: 'zoomout', speed: controSpeed })" @mouseup.prevent="$emit('ptz-stop')">
+            <i class="el-icon-zoom-out" /><span>变倍-</span>
+          </div>
+        </div>
+        <div class="ptz-func-row">
+          <div class="ptz-func-btn" title="聚焦+" @mousedown.prevent="$emit('focus-move', { command: 'near', speed: controSpeed })" @mouseup.prevent="$emit('focus-stop')">
+            <i class="iconfont icon-bianjiao-fangda" /><span>聚焦+</span>
+          </div>
+          <div class="ptz-func-btn" title="聚焦-" @mousedown.prevent="$emit('focus-move', { command: 'far', speed: controSpeed })" @mouseup.prevent="$emit('focus-stop')">
+            <i class="iconfont icon-bianjiao-suoxiao" /><span>聚焦-</span>
+          </div>
+        </div>
+        <div class="ptz-func-row">
+          <div class="ptz-func-btn" title="光圈+" @mousedown.prevent="$emit('iris-move', { command: 'in', speed: controSpeed })" @mouseup.prevent="$emit('iris-stop')">
+            <i class="iconfont icon-guangquan" /><span>光圈+</span>
+          </div>
+          <div class="ptz-func-btn" title="光圈-" @mousedown.prevent="$emit('iris-move', { command: 'out', speed: controSpeed })" @mouseup.prevent="$emit('iris-stop')">
+            <i class="iconfont icon-guangquan-" /><span>光圈-</span>
+          </div>
+        </div>
+      </div>
+      <ptzPrecise v-if="showPrecise" :device-id="deviceId" :channel-device-id="channelId" @position="$emit('precise-position', $event)" style="margin-top: 6px" />
+    </div>
+  </div>
+</template>
+
+<script>
+import ptzPrecise from './ptzPrecise.vue'
+
+export default {
+  name: 'PtzControls',
+  components: { ptzPrecise },
+  props: {
+    deviceId: { type: String, default: null },
+    channelId: { type: String, default: null },
+    showPrecise: { type: Boolean, default: true }
+  },
+  data() {
+    return {
+      controSpeed: 5
+    }
+  },
+  mounted() {
+    window.addEventListener('mouseup', this.onWindowMouseUp)
+  },
+  beforeDestroy() {
+    window.removeEventListener('mouseup', this.onWindowMouseUp)
+  },
+  methods: {
+    onWindowMouseUp() {
+      this.$emit('ptz-stop')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.ptz-section-inner {
+  display: flex;
+  padding: 8px 4px;
+  overflow-y: auto;
+}
+.ptz-left {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-right: 12px;
+}
+.ptz-dpad {
+  position: relative;
+  width: 180px;
+  height: 180px;
+  flex: none;
+}
+.dpad-ring {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 130px;
+  height: 130px;
+  border-radius: 50%;
+  background: #f5f7fa;
+  pointer-events: none;
+}
+.dpad-btn {
+  position: absolute;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  background: transparent;
+  border: none;
+  outline: none;
+  padding: 0;
+  user-select: none;
+  transition: all 0.15s;
+  -webkit-tap-highlight-color: transparent;
+}
+.card {
+  width: 46px;
+  height: 46px;
+  font-size: 18px;
+  color: #303133;
+}
+.card:hover {
+  background: #409EFF;
+  color: #fff;
+  box-shadow: 0 3px 10px rgba(64,158,255,0.4);
+  transform: scale(1.1);
+}
+.card:active {
+  background: #337ecc;
+  transform: scale(0.92);
+}
+.card-up { top: 18px; left: 67px; }
+.card-right { top: 67px; left: 116px; }
+.card-down { top: 116px; left: 67px; }
+.card-left { top: 67px; left: 18px; }
+.diag {
+  width: 36px;
+  height: 36px;
+  font-size: 14px;
+  color: #a8abb2;
+}
+.diag:hover {
+  background: #409EFF;
+  color: #fff;
+  box-shadow: 0 2px 8px rgba(64,158,255,0.35);
+  transform: scale(1.1);
+}
+.diag:active {
+  background: #337ecc;
+  transform: scale(0.9);
+}
+.diag-upright { top: 40px; left: 110px; }
+.diag-downright { top: 110px; left: 110px; }
+.diag-downleft { top: 110px; left: 34px; }
+.diag-upleft { top: 40px; left: 34px; }
+.dpad-center {
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 40px;
+  height: 40px;
+  background: linear-gradient(135deg, #eef0f4, #e0e3e8);
+  font-size: 20px;
+  color: #909399;
+  line-height: 1;
+}
+.dpad-center:hover {
+  background: #409EFF;
+  color: #fff;
+  box-shadow: 0 3px 10px rgba(64,158,255,0.4);
+  transform: translate(-50%, -50%) scale(1.1);
+}
+.dpad-center:active {
+  background: #337ecc;
+  transform: translate(-50%, -50%) scale(0.92);
+}
+.ptz-speed-slider {
+  display: flex;
+  align-items: center;
+  width: 120px;
+  margin-top: 8px;
+}
+.ptz-speed-label {
+  font-size: 12px;
+  color: #606266;
+  margin-right: 6px;
+  white-space: nowrap;
+}
+.ptz-right { flex: 1; }
+.ptz-func-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+}
+.ptz-func-row {
+  display: flex;
+  gap: 4px;
+  width: 100%;
+}
+.ptz-func-btn {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 44px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  cursor: pointer;
+  background: #fff;
+  user-select: none;
+  font-size: 11px;
+}
+.ptz-func-btn:hover {
+  background: #409EFF;
+  color: #fff;
+}
+.ptz-func-btn:active {
+  background: #337ecc;
+}
+.ptz-func-btn i { font-size: 14px; margin-bottom: 2px; }
+</style>
diff --git a/web/src/views/common/ptzPrecise.vue b/web/src/views/common/ptzPrecise.vue
new file mode 100644
index 000000000..6831e6c8b
--- /dev/null
+++ b/web/src/views/common/ptzPrecise.vue
@@ -0,0 +1,65 @@
+<template>
+  <div id="ptzPrecise">
+    <div class="precise-title">精确控制</div>
+    <div class="precise-row">
+      <span class="precise-label">水平</span>
+      <el-input-number size="mini" v-model="form.pan" :min="0" :max="3600" style="width: 100%" />
+    </div>
+    <div class="precise-row">
+      <span class="precise-label">垂直</span>
+      <el-input-number size="mini" v-model="form.tilt" :min="-1800" :max="1800" style="width: 100%" />
+    </div>
+    <div class="precise-row">
+      <span class="precise-label">变倍</span>
+      <el-input-number size="mini" v-model="form.zoom" :min="1" :max="128" style="width: 100%" />
+    </div>
+    <el-button size="mini" type="primary" style="width: 100%; margin-top: 4px" @click="emitPosition">定位</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PtzPrecise',
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      form: { pan: 0, tilt: 0, zoom: 1 }
+    }
+  },
+  methods: {
+    emitPosition() {
+      this.$emit('position', { ...this.form })
+    }
+  }
+}
+</script>
+
+<style scoped>
+#ptzPrecise {
+  padding: 6px 10px;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  background: #fafafa;
+}
+.precise-title {
+  font-size: 12px;
+  color: #606266;
+  margin-bottom: 4px;
+  font-weight: 500;
+}
+.precise-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 4px;
+}
+.precise-label {
+  font-size: 12px;
+  color: #909399;
+  width: 32px;
+  text-align: left;
+  flex-shrink: 0;
+}
+</style>
diff --git a/web/src/views/common/ptzPreset.vue b/web/src/views/common/ptzPreset.vue
index debd76b31..5e641eaea 100644
--- a/web/src/views/common/ptzPreset.vue
+++ b/web/src/views/common/ptzPreset.vue
@@ -3,46 +3,22 @@
     <el-tag
       v-for="item in presetList"
       :key="item.presetId"
-      closable
       size="mini"
       style="margin-right: 1rem; cursor: pointer; margin-bottom: 0.6rem"
-      @close="delPreset(item)"
       @click="gotoPreset(item)"
     >
-      {{ item.presetName?item.presetName:item.presetId }}
+      {{ item.presetName || item.presetId }}
     </el-tag>
-    <el-input
-      v-if="inputVisible"
-      ref="saveTagInput"
-      v-model="ptzPresetId"
-      min="1"
-      max="255"
-      placeholder="预置位编号"
-      addon-before="预置位编号"
-      addon-after="(1-255)"
-      style="width: 300px; vertical-align: bottom;"
-      size="small"
-    >
-      <template v-slot:append>
-        <el-button @click="addPreset()">保存</el-button>
-        <el-button @click="cancel()">取消</el-button>
-      </template>
-    </el-input>
-    <el-button v-else size="small" @click="showInput">+ 添加</el-button>
   </div>
 </template>
 
 <script>
-
 export default {
   name: 'PtzPreset',
-  components: {},
   props: ['channelDeviceId', 'deviceId'],
   data() {
     return {
-      presetList: [],
-      inputVisible: false,
-      ptzPresetId: ''
+      presetList: []
     }
   },
   created() {
@@ -53,54 +29,11 @@ export default {
       this.$store.dispatch('frontEnd/queryPreset', [this.deviceId, this.channelDeviceId])
         .then(data => {
           this.presetList = data
-          // 防止出现表格错位
-          this.$nextTick(() => {
-            this.$refs.channelListTable.doLayout()
-          })
         })
     },
-    showInput() {
-      this.inputVisible = true
-      this.$nextTick(_ => {
-        this.$refs.saveTagInput.$refs.input.focus()
-      })
-    },
-    addPreset: function() {
-      const loading = this.$loading({
-        lock: true,
-        fullscreen: true,
-        text: '正在发送指令',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      this.$store.dispatch('frontEnd/addPreset', [this.deviceId, this.channelDeviceId, this.ptzPresetId])
-        .then(data => {
-          setTimeout(() => {
-            this.inputVisible = false
-            this.ptzPresetId = ''
-            this.getPresetList()
-          }, 1000)
-        }).catch((error) => {
-          loading.close()
-          this.inputVisible = false
-          this.ptzPresetId = ''
-          this.$message({
-            showClose: true,
-            message: error,
-            type: 'error'
-          })
-        }).finally(() => {
-          loading.close()
-        })
-    },
-    cancel: function() {
-      this.inputVisible = false
-      this.ptzPresetId = ''
-    },
     gotoPreset: function(preset) {
-      console.log(preset)
       this.$store.dispatch('frontEnd/callPreset', [this.deviceId, this.channelDeviceId, preset.presetId])
-        .then(data => {
+        .then(() => {
           this.$message({
             showClose: true,
             message: '调用成功',
@@ -113,40 +46,7 @@ export default {
             type: 'error'
           })
         })
-    },
-    delPreset: function(preset) {
-      this.$confirm('确定删除此预置位', '提示', {
-        dangerouslyUseHTMLString: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const loading = this.$loading({
-          lock: true,
-          fullscreen: true,
-          text: '正在发送指令',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, preset.presetId])
-          .then(data => {
-            setTimeout(() => {
-              this.getPresetList()
-            }, 1000)
-          }).catch((error) => {
-            this.$message({
-              showClose: true,
-              message: error,
-              type: 'error'
-            })
-          }).finally(() => {
-            loading.close()
-          })
-      }).catch(() => {
-
-      })
     }
-
   }
 }
 </script>
diff --git a/web/src/views/device/channel/index.vue b/web/src/views/device/channel/index.vue
index eb26e64eb..a32eaa000 100755
--- a/web/src/views/device/channel/index.vue
+++ b/web/src/views/device/channel/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="channelList" style="height: calc(100vh - 124px);">
-    <div v-if="!editId" style="height: 100%">
+    <div v-if="!editId && !ptzConfigChannelDeviceId" style="height: 100%">
       <el-form :inline="true" size="mini">
         <el-form-item style="margin-right: 2rem">
           <el-page-header content="通道列表" @back="showDevice" />
@@ -189,6 +189,8 @@
                   设备录像控制-开始</el-dropdown-item>
                 <el-dropdown-item command="stopRecord" :disabled="device == null || device.online === 0">
                   设备录像控制-停止</el-dropdown-item>
+                <el-dropdown-item command="ptzConfig" :disabled="device == null || device.online === 0">
+                  云台配置</el-dropdown-item>
               </el-dropdown-menu>
 
             </el-dropdown>
@@ -209,6 +211,7 @@
 
     <devicePlayer ref="devicePlayer" />
     <channel-edit v-if="editId" :id="editId" :close-edit="closeEdit" />
+    <ptzConfig v-if="ptzConfigChannelDeviceId" :device-id="ptzConfigDeviceId" :channel-device-id="ptzConfigChannelDeviceId" @close="closePtzConfig" />
 
   </div>
 </template>
@@ -216,12 +219,14 @@
 <script>
 import devicePlayer from '../../dialog/devicePlayer.vue'
 import Edit from './edit.vue'
+import ptzConfig from '@/views/device/common/ptzConfig.vue'
 
 export default {
   name: 'ChannelList',
   components: {
     devicePlayer,
-    ChannelEdit: Edit
+    ChannelEdit: Edit,
+    ptzConfig
   },
   props: {
     defaultPage: {
@@ -258,6 +263,8 @@ export default {
       total: 0,
       beforeUrl: '/device',
       editId: null,
+      ptzConfigDeviceId: null,
+      ptzConfigChannelDeviceId: null,
       loadSnap: {},
       ptzTypes: {
         0: '未知',
@@ -278,7 +285,6 @@ export default {
     }
   },
   mounted() {
-    console.log(23222)
     if (this.deviceId) {
       this.$store.dispatch('device/queryDeviceOne', this.deviceId)
         .then(data => {
@@ -372,6 +378,10 @@ export default {
           itemData.playLoading = false
         })
     },
+    closePtzConfig: function() {
+      this.ptzConfigDeviceId = null
+      this.ptzConfigChannelDeviceId = null
+    },
     moreClick: function(command, itemData) {
       if (command === 'records') {
         this.queryRecords(itemData)
@@ -381,6 +391,10 @@ export default {
         this.startRecord(itemData)
       } else if (command === 'stopRecord') {
         this.stopRecord(itemData)
+      } else if (command === 'ptzConfig') {
+        console.log(itemData.channelId)
+        this.ptzConfigDeviceId = this.deviceId
+        this.ptzConfigChannelDeviceId = itemData.deviceId
       }
     },
     queryRecords: function(itemData) {
diff --git a/web/src/views/device/common/playerPtzPanel.vue b/web/src/views/device/common/playerPtzPanel.vue
new file mode 100644
index 000000000..789e76711
--- /dev/null
+++ b/web/src/views/device/common/playerPtzPanel.vue
@@ -0,0 +1,124 @@
+<template>
+  <div class="player-ptz-panel">
+    <div class="player-section">
+      <div class="player-wrapper" :style="{ height: playerHeight }">
+        <playerTabs ref="playerTabs" :video-url="videoUrl" :has-audio="hasAudio" :show-button="true" />
+      </div>
+    </div>
+    <div class="ptz-section">
+      <ptzControls
+        :device-id="deviceId"
+        :channel-id="channelDeviceId"
+        :show-precise="false"
+        @ptz-move="onPtzMove"
+        @ptz-stop="onPtzStop"
+        @focus-move="onFocusMove"
+        @focus-stop="onFocusStop"
+        @iris-move="onIrisMove"
+        @iris-stop="onIrisStop"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import playerTabs from '../../common/playerTabs.vue'
+import ptzControls from '../../common/ptzControls.vue'
+
+export default {
+  name: 'PlayerPtzPanel',
+  components: { playerTabs, ptzControls },
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      streamInfo: null,
+      videoUrl: '',
+      hasAudio: false,
+      playerHeight: '36vh'
+    }
+  },
+  mounted() {
+    this.startPlay()
+  },
+  beforeDestroy() {
+    this.stopPlay()
+  },
+  methods: {
+    ptzSpeed(speed) {
+      return parseInt(speed * 255 / 8)
+    },
+    onPtzMove(e) {
+      const speedVal = this.ptzSpeed(e.speed)
+      this.$store.dispatch('frontEnd/ptz', [this.deviceId, this.channelDeviceId, e.direction, speedVal, speedVal, speedVal])
+    },
+    onPtzStop() {
+      this.$store.dispatch('frontEnd/ptz', [this.deviceId, this.channelDeviceId, 'stop', 0, 0, 0])
+    },
+    onFocusMove(e) {
+      const speedVal = this.ptzSpeed(e.speed)
+      this.$store.dispatch('frontEnd/focus', [this.deviceId, this.channelDeviceId, e.command, speedVal])
+    },
+    onFocusStop() {
+      this.$store.dispatch('frontEnd/focus', [this.deviceId, this.channelDeviceId, 'stop', 0])
+    },
+    onIrisMove(e) {
+      const speedVal = this.ptzSpeed(e.speed)
+      this.$store.dispatch('frontEnd/iris', [this.deviceId, this.channelDeviceId, e.command, speedVal])
+    },
+    onIrisStop() {
+      this.$store.dispatch('frontEnd/iris', [this.deviceId, this.channelDeviceId, 'stop', 0])
+    },
+    startPlay() {
+      this.$store.dispatch('play/play', [this.deviceId, this.channelDeviceId])
+        .then(data => {
+          this.streamInfo = data
+          this.hasAudio = data.hasAudio
+          this.videoUrl = this.getUrlByStreamInfo(data)
+          this.$nextTick(() => {
+            if (this.$refs.playerTabs) {
+              this.$refs.playerTabs.play(this.videoUrl)
+            }
+          })
+        })
+        .catch(e => {
+          this.$message({ showClose: true, message: e || '播放失败', type: 'error' })
+        })
+    },
+    stopPlay() {
+      this.$store.dispatch('play/stop', { deviceId: this.deviceId, channelId: this.channelDeviceId })
+        .catch(() => {})
+    },
+    getUrlByStreamInfo(streamInfo) {
+      const info = streamInfo || this.streamInfo
+      if (!info) return ''
+      const src = info.transcodeStream || info
+      if (location.protocol === 'https:') {
+        return src['wss_flv']
+      }
+      return src['ws_flv']
+    }
+  }
+}
+</script>
+
+<style scoped>
+.player-ptz-panel {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+.player-section {
+  flex: 1;
+}
+.ptz-section {
+  flex-shrink: 0;
+  display: flex;
+}
+.player-wrapper {
+  position: relative;
+  width: 100%;
+}
+</style>
diff --git a/web/src/views/device/common/ptzConfig.vue b/web/src/views/device/common/ptzConfig.vue
new file mode 100644
index 000000000..3da124481
--- /dev/null
+++ b/web/src/views/device/common/ptzConfig.vue
@@ -0,0 +1,112 @@
+<template>
+  <div id="dhPtzConfigPage">
+    <el-page-header content="云台设置" @back="$emit('close')" />
+    <div class="ptz-config-body">
+      <div class="config-sidebar">
+        <el-menu :default-active="activeTab" @select="handleMenuSelect">
+          <el-menu-item index="preset">
+            <i class="el-icon-map-location" style="margin-right: 6px" />
+            <span>预置点</span>
+          </el-menu-item>
+          <el-menu-item index="cruise">
+            <i class="el-icon-s-order" style="margin-right: 6px" />
+            <span>巡航组</span>
+          </el-menu-item>
+          <el-menu-item index="scan">
+            <i class="el-icon-s-grid" style="margin-right: 6px" />
+            <span>自动扫描</span>
+          </el-menu-item>
+          <el-menu-item index="wiper">
+            <i class="el-icon-umbrella" style="margin-right: 6px" />
+            <span>雨刷</span>
+          </el-menu-item>
+          <el-menu-item index="switch">
+            <i class="el-icon-s-tools" style="margin-right: 6px" />
+            <span>辅助开关</span>
+          </el-menu-item>
+        </el-menu>
+      </div>
+      <div class="content-wrapper">
+        <div class="player-panel">
+          <playerPtzPanel :device-id="deviceId" :channel-device-id="channelDeviceId" />
+        </div>
+        <div class="tab-panel">
+          <ptzPresetConfig v-if="activeTab === 'preset'" :device-id="deviceId" :channel-device-id="channelDeviceId" />
+          <ptzCruiseConfig v-if="activeTab === 'cruise'" :device-id="deviceId" :channel-device-id="channelDeviceId" />
+          <ptzScanConfig v-if="activeTab === 'scan'" :device-id="deviceId" :channel-device-id="channelDeviceId" />
+          <ptzWiperConfig v-if="activeTab === 'wiper'" :device-id="deviceId" :channel-device-id="channelDeviceId" />
+          <ptzSwitchConfig v-if="activeTab === 'switch'" :device-id="deviceId" :channel-device-id="channelDeviceId" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import playerPtzPanel from './playerPtzPanel.vue'
+import ptzPresetConfig from './ptzPresetConfig.vue'
+import ptzCruiseConfig from './ptzCruiseConfig.vue'
+import ptzScanConfig from './ptzScanConfig.vue'
+import ptzWiperConfig from './ptzWiperConfig.vue'
+import ptzSwitchConfig from './ptzSwitchConfig.vue'
+
+export default {
+  name: 'PtzConfigPage',
+  components: { playerPtzPanel, ptzPresetConfig, ptzCruiseConfig, ptzScanConfig, ptzWiperConfig, ptzSwitchConfig },
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      activeTab: 'preset'
+    }
+  },
+  methods: {
+    handleMenuSelect(index) {
+      this.activeTab = index
+    }
+  }
+}
+</script>
+
+<style scoped>
+#dhPtzConfigPage {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.ptz-config-body {
+  flex: 1;
+  display: flex;
+  overflow: hidden;
+  padding-top: 16px;
+}
+.config-sidebar {
+  width: 140px;
+  flex: none;
+  border-right: 1px solid #e6e6e6;
+  overflow-y: auto;
+}
+.config-sidebar .el-menu {
+  border-right: none;
+}
+.content-wrapper {
+  flex: 1;
+  display: flex;
+  overflow: hidden;
+}
+.player-panel {
+  width: 600px;
+  flex: none;
+  display: flex;
+  flex-direction: column;
+  border-right: 1px solid #e6e6e6;
+  padding: 0 12px;
+}
+.tab-panel {
+  flex: 1;
+  overflow: auto;
+  padding: 0 12px;
+}
+</style>
diff --git a/web/src/views/device/common/ptzCruiseConfig.vue b/web/src/views/device/common/ptzCruiseConfig.vue
new file mode 100644
index 000000000..68e346974
--- /dev/null
+++ b/web/src/views/device/common/ptzCruiseConfig.vue
@@ -0,0 +1,200 @@
+<template>
+  <div style="height: 100%; display: flex; flex-direction: column;">
+    <el-form size="small" inline style="margin-bottom: 12px; padding: 16px 8px; border: 1px solid #e6e6e6; border-radius: 4px;">
+      <el-form-item label="巡航组号" style="margin-bottom: 0;">
+        <el-input-number v-model="cruiseId" :min="1" :max="255" controls-position="right" style="width: 140px" />
+      </el-form-item>
+    </el-form>
+    <div v-if="presetPoints.length > 0" style="margin-bottom: 8px;">
+      <el-tag
+        v-for="(item, index) in presetPoints"
+        :key="index"
+        closable
+        size="small"
+        style="margin-right: 8px; margin-bottom: 4px;"
+        @close="removePoint(item, index)"
+      >
+        {{ item.presetName || ('预置点' + item.presetId) }}
+      </el-tag>
+    </div>
+    <div v-else style="color: #909399; font-size: 12px; margin-bottom: 8px;">暂无巡航点</div>
+    <el-form v-if="showAddPoint" size="mini" inline style="margin-bottom: 8px;">
+      <el-form-item style="margin-bottom: 0;">
+        <el-select v-model="selectedPreset" placeholder="选择预置点" style="width: 160px">
+          <el-option
+            v-for="p in allPresetList"
+            :key="p.presetId"
+            :label="p.presetName || ('预置点' + p.presetId)"
+            :value="p"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0;">
+        <el-button type="primary" @click="addPoint">确定</el-button>
+        <el-button @click="showAddPoint = false">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <el-button v-else size="small" style="margin-bottom: 8px;" @click="showAddPoint = true">添加巡航点</el-button>
+    <el-form v-if="showSpeedInput" size="mini" inline style="margin-bottom: 8px;">
+      <el-form-item label="速度" style="margin-bottom: 0;">
+        <el-input-number v-model="cruiseSpeed" :min="1" :max="255" controls-position="right" style="width: 120px" />
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0;">
+        <el-button type="primary" @click="setSpeed">确定</el-button>
+        <el-button @click="cancelSpeed">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <el-button v-else size="small" style="margin-bottom: 8px;" @click="openSpeed">设置巡航速度</el-button>
+    <el-form v-if="showTimeInput" size="mini" inline style="margin-bottom: 8px;">
+      <el-form-item label="停留时间(秒)" style="margin-bottom: 0;">
+        <el-input-number v-model="cruiseTime" :min="1" :max="300" controls-position="right" style="width: 120px" />
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0;">
+        <el-button type="primary" @click="setTime">确定</el-button>
+        <el-button @click="cancelTime">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <el-button v-else size="small" style="margin-bottom: 8px;" @click="openTime">设置巡航时间</el-button>
+    <div style="margin-top: 8px;">
+      <el-button size="small" type="primary" :loading="starting" :disabled="starting" @click="startCruise">开始巡航</el-button>
+      <el-button size="small" :loading="stopping" :disabled="stopping" @click="stopCruise">停止巡航</el-button>
+      <el-button size="small" type="danger" :loading="deleting" :disabled="deleting" @click="deleteCruise">删除巡航</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PtzCruiseConfig',
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      cruiseId: 1,
+      presetPoints: [],
+      allPresetList: [],
+      selectedPreset: null,
+      showAddPoint: false,
+      showSpeedInput: false,
+      showTimeInput: false,
+      cruiseSpeed: 5,
+      cruiseTime: 15,
+      starting: false,
+      stopping: false,
+      deleting: false
+    }
+  },
+  created() {
+    this.loadPresets()
+  },
+  methods: {
+    loadPresets() {
+      this.$store.dispatch('frontEnd/queryPreset', [this.deviceId, this.channelDeviceId])
+        .then(data => {
+          this.allPresetList = data || []
+        })
+        .catch(error => {
+          console.log('[巡航] 加载预置点列表失败', error)
+        })
+    },
+    addPoint() {
+      if (!this.selectedPreset) {
+        this.$message({ showClose: true, message: '请选择预置点', type: 'warning' })
+        return
+      }
+      this.$store.dispatch('frontEnd/addPointForCruise', [this.deviceId, this.channelDeviceId, this.cruiseId, this.selectedPreset.presetId])
+        .then(() => {
+          this.presetPoints.push(this.selectedPreset)
+          this.selectedPreset = null
+          this.showAddPoint = false
+          this.$message({ showClose: true, message: '添加成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        })
+    },
+    removePoint(preset, index) {
+      this.$store.dispatch('frontEnd/deletePointForCruise', [this.deviceId, this.channelDeviceId, this.cruiseId, preset.presetId])
+        .then(() => {
+          this.presetPoints.splice(index, 1)
+          this.$message({ showClose: true, message: '删除成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        })
+    },
+    openSpeed() {
+      this.showSpeedInput = true
+    },
+    cancelSpeed() {
+      this.showSpeedInput = false
+      this.cruiseSpeed = 5
+    },
+    setSpeed() {
+      this.$store.dispatch('frontEnd/setCruiseSpeed', [this.deviceId, this.channelDeviceId, this.cruiseId, this.cruiseSpeed])
+        .then(() => {
+          this.showSpeedInput = false
+          this.$message({ showClose: true, message: '速度设置成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        })
+    },
+    openTime() {
+      this.showTimeInput = true
+    },
+    cancelTime() {
+      this.showTimeInput = false
+      this.cruiseTime = 15
+    },
+    setTime() {
+      this.$store.dispatch('frontEnd/setCruiseTime', [this.deviceId, this.channelDeviceId, this.cruiseId, this.cruiseTime])
+        .then(() => {
+          this.showTimeInput = false
+          this.$message({ showClose: true, message: '时间设置成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        })
+    },
+    startCruise() {
+      this.starting = true
+      this.$store.dispatch('frontEnd/startCruise', [this.deviceId, this.channelDeviceId, this.cruiseId])
+        .then(() => {
+          this.$message({ showClose: true, message: '巡航启动成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.starting = false
+        })
+    },
+    stopCruise() {
+      this.stopping = true
+      this.$store.dispatch('frontEnd/stopCruise', [this.deviceId, this.channelDeviceId, this.cruiseId])
+        .then(() => {
+          this.$message({ showClose: true, message: '巡航停止成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.stopping = false
+        })
+    },
+    deleteCruise() {
+      this.$confirm('确定删除此巡航组所有点?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.deleting = true
+        this.$store.dispatch('frontEnd/deletePointForCruise', [this.deviceId, this.channelDeviceId, this.cruiseId, 0])
+          .then(() => {
+            this.presetPoints = []
+            this.$message({ showClose: true, message: '删除成功', type: 'success' })
+          }).catch(error => {
+            this.$message({ showClose: true, message: error, type: 'error' })
+          }).finally(() => {
+            this.deleting = false
+          })
+      }).catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/web/src/views/device/common/ptzPresetConfig.vue b/web/src/views/device/common/ptzPresetConfig.vue
new file mode 100644
index 000000000..feb492f8a
--- /dev/null
+++ b/web/src/views/device/common/ptzPresetConfig.vue
@@ -0,0 +1,156 @@
+<template>
+  <div style="height: 100%; display: flex; flex-direction: column;">
+    <div style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 6px;">
+      <div>
+        <el-button type="primary" :disabled="showAddForm" @click="openAdd">添加预置点</el-button>
+        <el-button :loading="clearing" :disabled="clearing" @click="clearAll">清空</el-button>
+      </div>
+      <el-button icon="el-icon-refresh-right" circle @click="getPresetList" />
+    </div>
+    <el-form v-if="showAddForm" size="small" inline style="margin-bottom: 6px; padding: 16px 8px; border: 1px solid #e6e6e6; border-radius: 4px; display: flex; align-items: center;">
+      <el-form-item label="序号" style="margin-bottom: 0; margin-right: 2rem">
+        <el-input-number v-model="addPresetId" :min="1" :max="255" controls-position="right" style="width: 180px" />
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0;">
+        <el-button type="primary" :loading="submitting" :disabled="submitting" @click="confirmAdd">确定</el-button>
+        <el-button @click="cancelAdd">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="presetList"
+      border
+      stripe
+      max-height="100%"
+      style="flex: 1"
+    >
+      <el-table-column prop="presetId" label="序号" align="center" />
+      <el-table-column label="名称">
+        <template v-slot="{ row }">
+          <span>{{ row.presetName || ('预置点' + row.presetId) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" min-width="140" align="center">
+        <template v-slot="{ row }">
+          <el-button size="mini" type="text" @click="callPreset(row)">调用</el-button>
+          <el-button size="mini" type="text" style="color: #F56C6C" :loading="deletingId === row.presetId" :disabled="deletingId !== null" @click="delPreset(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PtzPresetConfig',
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      presetList: [],
+      showAddForm: false,
+      addPresetId: 1,
+      submitting: false,
+      clearing: false,
+      deletingId: null
+    }
+  },
+  created() {
+    this.getPresetList()
+  },
+  methods: {
+    getPresetList() {
+      this.$store.dispatch('frontEnd/queryPreset', [this.deviceId, this.channelDeviceId])
+        .then(data => {
+          this.presetList = data || []
+        })
+        .catch(error => {
+          console.log(error)
+        })
+    },
+    openAdd() {
+      this.addPresetId = this.getNextAvailableId()
+      this.showAddForm = true
+    },
+    cancelAdd() {
+      this.showAddForm = false
+      this.addPresetId = 1
+    },
+    confirmAdd() {
+      const exists = this.presetList.some(p => p.presetId === this.addPresetId)
+      if (exists) {
+        this.$message({ showClose: true, message: '序号 ' + this.addPresetId + ' 已存在', type: 'warning' })
+        return
+      }
+      this.submitting = true
+      this.$store.dispatch('frontEnd/addPreset', [this.deviceId, this.channelDeviceId, this.addPresetId])
+        .then(() => {
+          this.showAddForm = false
+          setTimeout(() => {
+            this.getPresetList()
+          }, 600)
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.submitting = false
+        })
+    },
+    callPreset(preset) {
+      this.$store.dispatch('frontEnd/callPreset', [this.deviceId, this.channelDeviceId, preset.presetId])
+        .then(() => {
+          this.$message({ showClose: true, message: '调用成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        })
+    },
+    delPreset(preset) {
+      this.$confirm('确定删除此预置位', '提示', {
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.deletingId = preset.presetId
+        this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, preset.presetId])
+          .then(() => {
+            this.getPresetList()
+          }).catch(error => {
+            this.$message({ showClose: true, message: error, type: 'error' })
+          }).finally(() => {
+            this.deletingId = null
+          })
+      }).catch(() => {})
+    },
+    clearAll() {
+      if (this.presetList.length === 0) return
+      this.$confirm('确定清空所有预置点?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.clearing = true
+        const promises = this.presetList.map(p =>
+          this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, p.presetId])
+        )
+        Promise.all(promises).then(() => {
+          this.presetList = []
+          this.$message({ showClose: true, message: '清空成功', type: 'success' })
+        }).catch(() => {
+          this.$message({ showClose: true, message: '清空失败', type: 'error' })
+        }).finally(() => {
+          this.clearing = false
+        })
+      }).catch(() => {})
+    },
+    getNextAvailableId() {
+      if (!this.presetList || this.presetList.length === 0) return 1
+      const used = this.presetList.map(p => p.presetId).sort((a, b) => a - b)
+      for (let i = 0; i < used.length - 1; i++) {
+        if (used[i + 1] - used[i] > 1) return used[i] + 1
+      }
+      return used[used.length - 1] + 1
+    }
+  }
+}
+</script>
diff --git a/web/src/views/device/common/ptzScanConfig.vue b/web/src/views/device/common/ptzScanConfig.vue
new file mode 100644
index 000000000..a9dcd2481
--- /dev/null
+++ b/web/src/views/device/common/ptzScanConfig.vue
@@ -0,0 +1,107 @@
+<template>
+  <div style="height: 100%; display: flex; flex-direction: column;">
+    <el-form size="small" inline style="margin-bottom: 12px; padding: 16px 8px; border: 1px solid #e6e6e6; border-radius: 4px;">
+      <el-form-item label="扫描组号" style="margin-bottom: 0;">
+        <el-input-number v-model="scanId" :min="1" :max="255" controls-position="right" style="width: 140px" />
+      </el-form-item>
+    </el-form>
+    <div style="margin-bottom: 8px;">
+      <el-button size="small" :loading="leftLoading" :disabled="leftLoading" @click="setLeft">设置左边界</el-button>
+      <el-button size="small" :loading="rightLoading" :disabled="rightLoading" @click="setRight">设置右边界</el-button>
+    </div>
+    <el-form v-if="showSpeedInput" size="mini" inline style="margin-bottom: 8px;">
+      <el-form-item label="扫描速度" style="margin-bottom: 0;">
+        <el-input-number v-model="scanSpeed" :min="1" :max="255" controls-position="right" style="width: 120px" />
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0;">
+        <el-button type="primary" @click="setSpeed">确定</el-button>
+        <el-button @click="cancelSpeed">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <el-button v-else size="small" style="margin-bottom: 8px;" @click="showSpeedInput = true">设置扫描速度</el-button>
+    <div style="margin-top: 8px;">
+      <el-button size="small" type="primary" :loading="starting" :disabled="starting" @click="startScan">开始自动扫描</el-button>
+      <el-button size="small" :loading="stopping" :disabled="stopping" @click="stopScan">停止自动扫描</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PtzScanConfig',
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      scanId: 1,
+      showSpeedInput: false,
+      scanSpeed: 5,
+      leftLoading: false,
+      rightLoading: false,
+      starting: false,
+      stopping: false
+    }
+  },
+  methods: {
+    setLeft() {
+      this.leftLoading = true
+      this.$store.dispatch('frontEnd/setLeftForScan', [this.deviceId, this.channelDeviceId, this.scanId])
+        .then(() => {
+          this.$message({ showClose: true, message: '左边界设置成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.leftLoading = false
+        })
+    },
+    setRight() {
+      this.rightLoading = true
+      this.$store.dispatch('frontEnd/setRightForScan', [this.deviceId, this.channelDeviceId, this.scanId])
+        .then(() => {
+          this.$message({ showClose: true, message: '右边界设置成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.rightLoading = false
+        })
+    },
+    setSpeed() {
+      this.$store.dispatch('frontEnd/setSpeedForScan', [this.deviceId, this.channelDeviceId, this.scanId, this.scanSpeed])
+        .then(() => {
+          this.showSpeedInput = false
+          this.$message({ showClose: true, message: '速度设置成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        })
+    },
+    cancelSpeed() {
+      this.showSpeedInput = false
+      this.scanSpeed = 5
+    },
+    startScan() {
+      this.starting = true
+      this.$store.dispatch('frontEnd/startScan', [this.deviceId, this.channelDeviceId, this.scanId])
+        .then(() => {
+          this.$message({ showClose: true, message: '扫描启动成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.starting = false
+        })
+    },
+    stopScan() {
+      this.stopping = true
+      this.$store.dispatch('frontEnd/stopScan', [this.deviceId, this.channelDeviceId, this.scanId])
+        .then(() => {
+          this.$message({ showClose: true, message: '扫描停止成功', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.stopping = false
+        })
+    }
+  }
+}
+</script>
diff --git a/web/src/views/device/common/ptzSwitchConfig.vue b/web/src/views/device/common/ptzSwitchConfig.vue
new file mode 100644
index 000000000..8ba49e2dd
--- /dev/null
+++ b/web/src/views/device/common/ptzSwitchConfig.vue
@@ -0,0 +1,42 @@
+<template>
+  <div>
+    <el-form size="mini" inline>
+      <el-form-item label="开关编号" style="margin-bottom: 0;">
+        <el-input-number v-model="switchId" :min="1" :max="255" controls-position="right" style="width: 140px" />
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0;">
+        <el-button size="small" :loading="loading" :disabled="loading" @click="control('on')">开启</el-button>
+        <el-button size="small" :loading="loading" :disabled="loading" @click="control('off')">关闭</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PtzSwitchConfig',
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      switchId: 1,
+      loading: false
+    }
+  },
+  methods: {
+    control(command) {
+      this.loading = true
+      this.$store.dispatch('frontEnd/auxiliary', [this.deviceId, this.channelDeviceId, command, this.switchId])
+        .then(() => {
+          this.$message({ showClose: true, message: command === 'on' ? '开关已开启' : '开关已关闭', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.loading = false
+        })
+    }
+  }
+}
+</script>
diff --git a/web/src/views/device/common/ptzWiperConfig.vue b/web/src/views/device/common/ptzWiperConfig.vue
new file mode 100644
index 000000000..c6203ccdc
--- /dev/null
+++ b/web/src/views/device/common/ptzWiperConfig.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+    <el-button size="small" :loading="loading" :disabled="loading" @click="control('on')">开启</el-button>
+    <el-button size="small" :loading="loading" :disabled="loading" @click="control('off')">关闭</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PtzWiperConfig',
+  props: {
+    deviceId: { type: String, default: null },
+    channelDeviceId: { type: String, default: null }
+  },
+  data() {
+    return {
+      loading: false
+    }
+  },
+  methods: {
+    control(command) {
+      this.loading = true
+      this.$store.dispatch('frontEnd/wiper', [this.deviceId, this.channelDeviceId, command])
+        .then(() => {
+          this.$message({ showClose: true, message: command === 'on' ? '雨刷已开启' : '雨刷已关闭', type: 'success' })
+        }).catch(error => {
+          this.$message({ showClose: true, message: error, type: 'error' })
+        }).finally(() => {
+          this.loading = false
+        })
+    }
+  }
+}
+</script>
diff --git a/web/src/views/dialog/devicePlayer.vue b/web/src/views/dialog/devicePlayer.vue
index d5ce75bc1..7de1152d2 100755
--- a/web/src/views/dialog/devicePlayer.vue
+++ b/web/src/views/dialog/devicePlayer.vue
@@ -5,319 +5,119 @@
       v-if="showVideoDialog"
       v-el-drag-dialog
       title="视频播放"
-      top="0"
-      append-to-body
-      width="40vw"
+      top="2vh"
+      width="65vw"
       :close-on-click-modal="false"
       :visible.sync="showVideoDialog"
       @close="close()"
     >
-      <div style="width: 100%; ">
-        <el-tabs
-          v-if="Object.keys(this.player).length > 1"
-          v-model="activePlayer"
-          type="card"
-          :stretch="true"
-          @tab-click="changePlayer"
-        >
-          <el-tab-pane label="Jessibuca" name="jessibuca">
-            <jessibucaPlayer
-              style="height: 22.5vw"
-              v-if="activePlayer === 'jessibuca'"
-              ref="jessibuca"
-              :visible.sync="showVideoDialog"
-              :error="videoError"
-              :message="videoError"
-              :has-audio="hasAudio"
-              :show-button="true"
-              fluent
-              autoplay
-              live
+      <div class="dhsdk-player-body">
+
+        <div class="player-side">
+          <div class="player-container" :style="{ height: playerHeight }">
+            <playerTabs ref="playerTabs" :video-url="videoUrl" :has-audio="hasAudio" :show-button="true" />
+          </div>
+        </div>
+
+        <div class="control-side">
+          <div v-if="showPtz" class="ptz-section">
+            <ptzControls
+              :device-id="deviceId"
+              :channel-id="channelId"
+              @ptz-move="onPtzMove"
+              @ptz-stop="onPtzStop"
+              @focus-move="onFocusMove"
+              @focus-stop="onFocusStop"
+              @iris-move="onIrisMove"
+              @iris-stop="onIrisStop"
             />
+          </div>
 
-          </el-tab-pane>
-          <el-tab-pane label="WebRTC" name="webRTC">
-            <rtc-player
-              v-if="activePlayer === 'webRTC'"
-              ref="webRTC"
-              :visible.sync="showVideoDialog"
-              :error="videoError"
-              :message="videoError"
-              height="100px"
-              :has-audio="hasAudio"
-              fluent
-              autoplay
-              live
-            />
-          </el-tab-pane>
-          <el-tab-pane label="h265web" name="h265web">
-            <h265web
-              v-if="activePlayer === 'h265web'"
-              ref="h265web"
-              :error="videoError"
-              :message="videoError"
-              :has-audio="hasAudio"
-              fluent
-              autoplay
-              live
-              :show-button="true"
-            />
-
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <div id="shared" style="text-align: right; margin-top: 1rem;">
-
-        <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
-          <el-tab-pane label="实时视频" name="media">
-            <div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
-              <span style="width: 5rem; line-height: 2.5rem; text-align: right;">播放地址：</span>
-              <el-input v-model="getPlayerShared.sharedUrl" :disabled="true">
-                <template slot="append">
-                  <i
-                    class="cpoy-btn el-icon-document-copy"
-                    title="点击拷贝"
-                    style="cursor: pointer"
-                    @click="copyUrl(getPlayerShared.sharedUrl)"
-                  />
-                </template>
-              </el-input>
-            </div>
-            <div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
-              <span style="width: 5rem; line-height: 2.5rem; text-align: right;">iframe：</span>
-              <el-input v-model="getPlayerShared.sharedIframe" :disabled="true">
-                <template slot="append">
-                  <i
-                    class="cpoy-btn el-icon-document-copy"
-                    title="点击拷贝"
-                    style="cursor: pointer"
-                    @click="copyUrl(getPlayerShared.sharedIframe)"
-                  />
-                </template>
-              </el-input>
-            </div>
-            <div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
-              <span style="width: 5rem; line-height: 2.5rem; text-align: right;">资源地址：</span>
-              <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true">
-                <el-button
-                  slot="append"
-                  icon="el-icon-document-copy"
-                  title="点击拷贝"
-                  style="cursor: pointer"
-                  @click="copyUrl(getPlayerShared.sharedIframe)"
-                />
-                <el-dropdown v-if="streamInfo" slot="prepend" trigger="click" @command="copyUrl">
-                  <el-button>
-                    更多地址<i class="el-icon-arrow-down el-icon--right" />
-                  </el-button>
-                  <el-dropdown-menu>
-                    <el-dropdown-item v-if="streamInfo.flv" :command="streamInfo.flv">
-                      <el-tag>FLV:</el-tag>
-                      <span>{{ streamInfo.flv }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.https_flv" :command="streamInfo.https_flv">
-                      <el-tag>FLV(https):</el-tag>
-                      <span>{{ streamInfo.https_flv }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.ws_flv" :command="streamInfo.ws_flv">
-                      <el-tag>FLV(ws):</el-tag>
-                      <span>{{ streamInfo.ws_flv }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.wss_flv" :command="streamInfo.wss_flv">
-                      <el-tag>FLV(wss):</el-tag>
-                      <span>{{ streamInfo.wss_flv }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.fmp4" :command="streamInfo.fmp4">
-                      <el-tag>FMP4:</el-tag>
-                      <span>{{ streamInfo.fmp4 }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.https_fmp4" :command="streamInfo.https_fmp4">
-                      <el-tag>FMP4(https):</el-tag>
-                      <span>{{ streamInfo.https_fmp4 }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.ws_fmp4" :command="streamInfo.ws_fmp4">
-                      <el-tag>FMP4(ws):</el-tag>
-                      <span>{{ streamInfo.ws_fmp4 }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.wss_fmp4" :command="streamInfo.wss_fmp4">
-                      <el-tag>FMP4(wss):</el-tag>
-                      <span>{{ streamInfo.wss_fmp4 }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.hls" :command="streamInfo.hls">
-                      <el-tag>HLS:</el-tag>
-                      <span>{{ streamInfo.hls }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.https_hls" :command="streamInfo.https_hls">
-                      <el-tag>HLS(https):</el-tag>
-                      <span>{{ streamInfo.https_hls }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.ws_hls" :command="streamInfo.ws_hls">
-                      <el-tag>HLS(ws):</el-tag>
-                      <span>{{ streamInfo.ws_hls }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.wss_hls" :command="streamInfo.wss_hls">
-                      <el-tag>HLS(wss):</el-tag>
-                      <span>{{ streamInfo.wss_hls }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.ts" :command="streamInfo.ts">
-                      <el-tag>TS:</el-tag>
-                      <span>{{ streamInfo.ts }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.https_ts" :command="streamInfo.https_ts">
-                      <el-tag>TS(https):</el-tag>
-                      <span>{{ streamInfo.https_ts }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.ws_ts" :command="streamInfo.ws_ts">
-                      <el-tag>TS(ws):</el-tag>
-                      <span>{{ streamInfo.ws_ts }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.wss_ts" :command="streamInfo.wss_ts">
-                      <el-tag>TS(wss):</el-tag>
-                      <span>{{ streamInfo.wss_ts }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.rtc" :command="streamInfo.rtc">
-                      <el-tag>RTC:</el-tag>
-                      <span>{{ streamInfo.rtc }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.rtcs" :command="streamInfo.rtcs">
-                      <el-tag>RTCS:</el-tag>
-                      <span>{{ streamInfo.rtcs }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.rtmp" :command="streamInfo.rtmp">
-                      <el-tag>RTMP:</el-tag>
-                      <span>{{ streamInfo.rtmp }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.rtmps" :command="streamInfo.rtmps">
-                      <el-tag>RTMPS:</el-tag>
-                      <span>{{ streamInfo.rtmps }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.rtsp" :command="streamInfo.rtsp">
-                      <el-tag>RTSP:</el-tag>
-                      <span>{{ streamInfo.rtsp }}</span>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="streamInfo.rtsps" :command="streamInfo.rtsps">
-                      <el-tag>RTSPS:</el-tag>
-                      <span>{{ streamInfo.rtsps }}</span>
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </el-input>
-
-            </div>
-          </el-tab-pane>
-          <!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
-          <!--遥控界面-->
-          <el-tab-pane v-if="showPtz" label="云台控制" name="control">
-            <div style="display: grid; grid-template-columns: 240px auto; height: 180px; overflow: auto">
-              <div style="display: grid; grid-template-columns: 6.25rem auto;">
-
-                <div class="control-wrapper">
-                  <div class="control-btn control-top" @mousedown="ptzCamera('up')" @mouseup="ptzCamera('stop')">
-                    <i class="el-icon-caret-top" />
-                    <div class="control-inner-btn control-inner" />
-                  </div>
-                  <div class="control-btn control-left" @mousedown="ptzCamera('left')" @mouseup="ptzCamera('stop')">
-                    <i class="el-icon-caret-left" />
-                    <div class="control-inner-btn control-inner" />
-                  </div>
-                  <div class="control-btn control-bottom" @mousedown="ptzCamera('down')" @mouseup="ptzCamera('stop')">
-                    <i class="el-icon-caret-bottom" />
-                    <div class="control-inner-btn control-inner" />
-                  </div>
-                  <div class="control-btn control-right" @mousedown="ptzCamera('right')" @mouseup="ptzCamera('stop')">
-                    <i class="el-icon-caret-right" />
-                    <div class="control-inner-btn control-inner" />
-                  </div>
-                  <div class="control-round">
-                    <div class="control-round-inner"><i class="fa fa-pause-circle" /></div>
-                  </div>
-                  <div class="contro-speed" style="position: absolute; left: 4px; top: 7rem; width: 6.25rem;">
-                    <el-slider v-model="controSpeed" :max="100" />
-                  </div>
-                </div>
-                <div>
-                  <div class="ptz-btn-box">
-                    <div style="" title="变倍+" @mousedown="ptzCamera('zoomin')" @mouseup="ptzCamera('stop')">
-                      <i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.5rem;" />
-                    </div>
-                    <div style="" title="变倍-" @mousedown="ptzCamera('zoomout')" @mouseup="ptzCamera('stop')">
-                      <i class="el-icon-zoom-out control-zoom-btn" style="font-size: 1.5rem;" />
-                    </div>
-                  </div>
-                  <div class="ptz-btn-box">
-                    <div title="聚焦+" @mousedown="focusCamera('near')" @mouseup="focusCamera('stop')">
-                      <i class="iconfont icon-bianjiao-fangda control-zoom-btn" style="font-size: 1.5rem;" />
-                    </div>
-                    <div title="聚焦-" @mousedown="focusCamera('far')" @mouseup="focusCamera('stop')">
-                      <i class="iconfont icon-bianjiao-suoxiao control-zoom-btn" style="font-size: 1.5rem;" />
-                    </div>
-                  </div>
-                  <div class="ptz-btn-box">
-                    <div title="光圈+" @mousedown="irisCamera('in')" @mouseup="irisCamera('stop')">
-                      <i class="iconfont icon-guangquan control-zoom-btn" style="font-size: 1.5rem;" />
-                    </div>
-                    <div title="光圈-" @mousedown="irisCamera('out')" @mouseup="irisCamera('stop')">
-                      <i class="iconfont icon-guangquan- control-zoom-btn" style="font-size: 1.5rem;" />
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div style="text-align: left" v-if="tabActiveName === 'control'">
-                <el-select
-                  v-model="ptzMethod"
-                  style="width: 100%"
-                  size="mini"
-                  placeholder="请选择云台功能"
-                >
-                  <el-option label="预置点" value="preset" />
-                  <el-option label="巡航组" value="cruise" />
-                  <el-option label="自动扫描" value="scan" />
-                  <el-option label="雨刷" value="wiper" />
-                  <el-option label="辅助开关" value="switch" />
-                </el-select>
-
-                <ptzPreset v-if="ptzMethod === 'preset'" :channel-device-id="channelId" :device-id="deviceId" style="margin-top: 1rem" />
-                <ptzCruising v-if="ptzMethod === 'cruise'" :channel-device-id="channelId" :device-id="deviceId" style="margin-top: 1rem" />
-                <ptzScan v-if="ptzMethod === 'scan'" :channel-device-id="channelId" :device-id="deviceId" style="margin-top: 1rem" />
-                <ptzWiper v-if="ptzMethod === 'wiper'" :channel-device-id="channelId" :device-id="deviceId" style="margin-top: 1rem" />
-                <ptzSwitch v-if="ptzMethod === 'switch'" :channel-device-id="channelId" :device-id="deviceId" style="margin-top: 1rem" />
-              </div>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="编码信息" name="codec">
-            <mediaInfo ref="mediaInfo" :app="app" :stream="streamId" :media-server-id="mediaServerId" />
-          </el-tab-pane>
-          <el-tab-pane v-if="showBroadcast" label="语音对讲" name="broadcast">
-            <div style="padding: 0 10px">
-              <!--              <el-switch v-model="broadcastMode" :disabled="broadcastStatus !== -1" active-color="#409EFF"-->
-              <!--                         active-text="喊话(Broadcast)"-->
-              <!--                         inactive-text="对讲(Talk)"></el-switch>-->
-
-              <el-radio-group v-model="broadcastMode" :disabled="broadcastStatus !== -1">
-                <el-radio :label="true">喊话(Broadcast)</el-radio>
-                <el-radio :label="false">对讲(Talk)</el-radio>
-              </el-radio-group>
-            </div>
-            <div class="trank" style="text-align: center;">
-              <el-button
-                :type="getBroadcastStatus()"
-                :disabled="broadcastStatus === -2"
-                circle
-                icon="el-icon-microphone"
-                style="font-size: 32px; padding: 24px;margin-top: 24px;"
-                @click="broadcastStatusClick()"
+          <el-tabs v-model="tabActiveName" @tab-click="tabHandleClick" class="control-tabs">
+            <el-tab-pane label="预置位" name="preset">
+              <ptzPreset
+                v-if="tabActiveName === 'preset'"
+                :device-id="deviceId"
+                :channel-device-id="channelId"
+                style="margin-top: 8px"
               />
-              <p>
-                <span v-if="broadcastStatus === -2">正在释放资源</span>
-                <span v-if="broadcastStatus === -1">点击开始对讲</span>
-                <span v-if="broadcastStatus === 0">等待接通中...</span>
-                <span v-if="broadcastStatus === 1">请说话</span>
-              </p>
+            </el-tab-pane>
+            <el-tab-pane label="实时视频" name="media">
+              <div v-if="tabActiveName === 'media'" class="media-info-content">
+                <div class="media-row">
+                  <span class="media-label">播放地址：</span>
+                  <el-input v-model="getPlayerShared.sharedUrl" :disabled="true">
+                    <template slot="append">
+                      <i class="cpoy-btn el-icon-document-copy" title="点击拷贝" style="cursor: pointer" @click="copyUrl(getPlayerShared.sharedUrl)" />
+                    </template>
+                  </el-input>
+                </div>
+                <div class="media-row">
+                  <span class="media-label">iframe：</span>
+                  <el-input v-model="getPlayerShared.sharedIframe" :disabled="true">
+                    <template slot="append">
+                      <i class="cpoy-btn el-icon-document-copy" title="点击拷贝" style="cursor: pointer" @click="copyUrl(getPlayerShared.sharedIframe)" />
+                    </template>
+                  </el-input>
+                </div>
+                <div class="media-row">
+                  <span class="media-label">资源地址：</span>
+                  <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true">
+                    <el-button slot="append" icon="el-icon-document-copy" title="点击拷贝" style="cursor: pointer" @click="copyUrl(getPlayerShared.sharedIframe)" />
+                    <el-dropdown v-if="streamInfo" slot="prepend" trigger="click" @command="copyUrl">
+                      <el-button>更多地址<i class="el-icon-arrow-down el-icon--right" /></el-button>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item v-if="streamInfo.flv" :command="streamInfo.flv"><el-tag>FLV:</el-tag><span>{{ streamInfo.flv }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.https_flv" :command="streamInfo.https_flv"><el-tag>FLV(https):</el-tag><span>{{ streamInfo.https_flv }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.ws_flv" :command="streamInfo.ws_flv"><el-tag>FLV(ws):</el-tag><span>{{ streamInfo.ws_flv }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.wss_flv" :command="streamInfo.wss_flv"><el-tag>FLV(wss):</el-tag><span>{{ streamInfo.wss_flv }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.fmp4" :command="streamInfo.fmp4"><el-tag>FMP4:</el-tag><span>{{ streamInfo.fmp4 }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.https_fmp4" :command="streamInfo.https_fmp4"><el-tag>FMP4(https):</el-tag><span>{{ streamInfo.https_fmp4 }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.ws_fmp4" :command="streamInfo.ws_fmp4"><el-tag>FMP4(ws):</el-tag><span>{{ streamInfo.ws_fmp4 }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.wss_fmp4" :command="streamInfo.wss_fmp4"><el-tag>FMP4(wss):</el-tag><span>{{ streamInfo.wss_fmp4 }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.hls" :command="streamInfo.hls"><el-tag>HLS:</el-tag><span>{{ streamInfo.hls }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.https_hls" :command="streamInfo.https_hls"><el-tag>HLS(https):</el-tag><span>{{ streamInfo.https_hls }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.ws_hls" :command="streamInfo.ws_hls"><el-tag>HLS(ws):</el-tag><span>{{ streamInfo.ws_hls }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.wss_hls" :command="streamInfo.wss_hls"><el-tag>HLS(wss):</el-tag><span>{{ streamInfo.wss_hls }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.ts" :command="streamInfo.ts"><el-tag>TS:</el-tag><span>{{ streamInfo.ts }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.https_ts" :command="streamInfo.https_ts"><el-tag>TS(https):</el-tag><span>{{ streamInfo.https_ts }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.ws_ts" :command="streamInfo.ws_ts"><el-tag>TS(ws):</el-tag><span>{{ streamInfo.ws_ts }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.wss_ts" :command="streamInfo.wss_ts"><el-tag>TS(wss):</el-tag><span>{{ streamInfo.wss_ts }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.rtc" :command="streamInfo.rtc"><el-tag>RTC:</el-tag><span>{{ streamInfo.rtc }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.rtcs" :command="streamInfo.rtcs"><el-tag>RTCS:</el-tag><span>{{ streamInfo.rtcs }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.rtmp" :command="streamInfo.rtmp"><el-tag>RTMP:</el-tag><span>{{ streamInfo.rtmp }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.rtmps" :command="streamInfo.rtmps"><el-tag>RTMPS:</el-tag><span>{{ streamInfo.rtmps }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.rtsp" :command="streamInfo.rtsp"><el-tag>RTSP:</el-tag><span>{{ streamInfo.rtsp }}</span></el-dropdown-item>
+                        <el-dropdown-item v-if="streamInfo.rtsps" :command="streamInfo.rtsps"><el-tag>RTSPS:</el-tag><span>{{ streamInfo.rtsps }}</span></el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </el-input>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="编码信息" name="codec">
+              <mediaInfo v-if="tabActiveName === 'codec'" ref="mediaInfo" :app="app" :stream="streamId" :media-server-id="mediaServerId" />
+            </el-tab-pane>
+            <el-tab-pane v-if="showBroadcast" label="语音对讲" name="broadcast">
+              <div style="padding: 0 10px">
+                <el-radio-group v-model="broadcastMode" :disabled="broadcastStatus !== -1">
+                  <el-radio :label="true">喊话(Broadcast)</el-radio>
+                  <el-radio :label="false">对讲(Talk)</el-radio>
+                </el-radio-group>
+              </div>
+              <div class="trank" style="text-align: center;">
+                <el-button :type="getBroadcastStatus()" :disabled="broadcastStatus === -2" circle icon="el-icon-microphone" style="font-size: 32px; padding: 24px;margin-top: 24px;" @click="broadcastStatusClick()" />
+                <p>
+                  <span v-if="broadcastStatus === -2">正在释放资源</span>
+                  <span v-if="broadcastStatus === -1">点击开始对讲</span>
+                  <span v-if="broadcastStatus === 0">等待接通中...</span>
+                  <span v-if="broadcastStatus === 1">请说话</span>
+                </p>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
 
-            </div>
-          </el-tab-pane>
-
-        </el-tabs>
       </div>
     </el-dialog>
   </div>
@@ -326,77 +126,41 @@
 <script>
 import elDragDialog from '@/directive/el-drag-dialog'
 import crypto from 'crypto'
-import rtcPlayer from '../common/rtcPlayer.vue'
-import jessibucaPlayer from '../common/jessibuca.vue'
+import playerTabs from '../common/playerTabs.vue'
+import ptzControls from '../common/ptzControls.vue'
 import PtzPreset from '../common/ptzPreset.vue'
-import PtzCruising from '../common/ptzCruising.vue'
-import ptzScan from '../common/ptzScan.vue'
-import ptzWiper from '../common/ptzWiper.vue'
-import ptzSwitch from '../common/ptzSwitch.vue'
 import mediaInfo from '../common/mediaInfo.vue'
-import H265web from '../common/h265web.vue'
 
 export default {
   name: 'DevicePlayer',
   directives: { elDragDialog },
-  components: {
-    H265web,
-    PtzPreset, PtzCruising, ptzScan, ptzWiper, ptzSwitch, mediaInfo,
-    jessibucaPlayer, rtcPlayer
-  },
+  components: { playerTabs, ptzControls, PtzPreset, mediaInfo },
   props: {},
   data() {
     return {
-      video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
       videoUrl: '',
-      activePlayer: 'jessibuca',
-      // 如何你只是用一种播放器，直接注释掉不用的部分即可
-      player: {
-        jessibuca: ['ws_flv', 'wss_flv'],
-        webRTC: ['rtc', 'rtcs'],
-        h265web: ['ws_flv', 'wss_flv']
-      },
-      showVideoDialog: false,
       streamId: '',
-      ptzMethod: 'preset',
-      ptzPresetId: '',
       app: '',
       mediaServerId: '',
       deviceId: '',
       channelId: '',
-      tabActiveName: 'media',
+      tabActiveName: 'preset',
       hasAudio: false,
-      loadingRecords: false,
-      recordsLoading: false,
       isLoging: false,
-      controSpeed: 30,
-      timeVal: 0,
-      timeMin: 0,
-      timeMax: 1440,
-      presetPos: 1,
-      cruisingSpeed: 100,
-      cruisingTime: 5,
-      cruisingGroup: 0,
-      scanSpeed: 100,
-      scanGroup: 0,
-      tracks: [],
+      showVideoDialog: false,
       showPtz: true,
       showBroadcast: true,
-      showRrecord: true,
-      sliderTime: 0,
-      seekTime: 0,
-      recordStartTime: 0,
-      showTimeText: '00:00:00',
       streamInfo: null,
       broadcastMode: true,
       broadcastRtc: null,
-      broadcastStatus: -1 // -2 正在释放资源 -1 默认状态 0 等待接通 1 接通成功
+      broadcastStatus: -1,
+      playerHeight: '36vh'
     }
   },
   computed: {
     getPlayerShared: function() {
       const typeMap = { jessibuca: 0, webRTC: 1, h265web: 2 }
-      const type = typeMap[this.activePlayer] || 0
+      const type = typeMap['jessibuca'] || 0
       const baseUrl = window.location.origin + '/#/play/share?type=' + type + '&url=' + encodeURIComponent(this.videoUrl)
       return {
         sharedUrl: baseUrl,
@@ -406,184 +170,109 @@ export default {
     }
   },
   created() {
-    console.log('created')
-    console.log(this.player)
     this.broadcastStatus = -1
-    if (Object.keys(this.player).length === 1) {
-      this.activePlayer = Object.keys(this.player)[0]
-    }
   },
   methods: {
-    tabHandleClick: function(tab, event) {
-      console.log(tab)
-      this.tracks = []
-      if (tab.name === 'codec') {
-        this.$refs.mediaInfo.startTask()
-      } else {
-        this.$refs.mediaInfo.stopTask()
-      }
+    ptzSpeed(speed) {
+      return parseInt(speed * 255 / 8)
     },
-    changePlayer: function(tab) {
-      console.log(this.player[tab.name][0])
-      this.activePlayer = tab.name
-      this.videoUrl = this.getUrlByStreamInfo()
-      if (this.$refs[this.activePlayer]) {
-        this.$refs[this.activePlayer].play(this.videoUrl)
+    onPtzMove(e) {
+      const speedVal = this.ptzSpeed(e.speed)
+      this.$store.dispatch('frontEnd/ptz', [this.deviceId, this.channelId, e.direction, speedVal, speedVal, speedVal])
+    },
+    onPtzStop() {
+      this.$store.dispatch('frontEnd/ptz', [this.deviceId, this.channelId, 'stop', 0, 0, 0])
+    },
+    onFocusMove(e) {
+      const speedVal = this.ptzSpeed(e.speed)
+      this.$store.dispatch('frontEnd/focus', [this.deviceId, this.channelId, e.command, speedVal])
+    },
+    onFocusStop() {
+      this.$store.dispatch('frontEnd/focus', [this.deviceId, this.channelId, 'stop', 0])
+    },
+    onIrisMove(e) {
+      const speedVal = this.ptzSpeed(e.speed)
+      this.$store.dispatch('frontEnd/iris', [this.deviceId, this.channelId, e.command, speedVal])
+    },
+    onIrisStop() {
+      this.$store.dispatch('frontEnd/iris', [this.deviceId, this.channelId, 'stop', 0])
+    },
+    tabHandleClick: function(tab) {
+      if (tab.name === 'codec') {
+        this.$refs.mediaInfo && this.$refs.mediaInfo.startTask()
       } else {
-        this.$nextTick(() => {
-          this.$refs[this.activePlayer].play(this.videoUrl)
-        })
+        this.$refs.mediaInfo && this.$refs.mediaInfo.stopTask()
       }
     },
     openDialog: function(tab, deviceId, channelId, param) {
-      if (this.showVideoDialog) {
-        return
-      }
-      this.tabActiveName = tab
-      this.channelId = channelId
+      if (this.showVideoDialog) return
+      this.tabActiveName = tab === 'streamPlay' ? 'media' : (tab || 'preset')
       this.deviceId = deviceId
+      this.channelId = channelId
       this.streamId = ''
       this.mediaServerId = ''
       this.app = ''
       this.videoUrl = ''
-      if (this.$refs[this.activePlayer]) {
-        this.$refs[this.activePlayer].pause()
-      }
-      switch (tab) {
-        case 'media':
-          this.play(param.streamInfo, param.hasAudio)
-          break
-        case 'streamPlay':
-          this.tabActiveName = 'media'
-          this.showRrecord = false
-          this.showPtz = false
-          this.showBroadcast = false
-          this.play(param.streamInfo, param.hasAudio)
-          break
-        case 'control':
-          break
+      if (param && param.streamInfo) {
+        this.play(param.streamInfo, param.hasAudio)
       }
     },
     play: function(streamInfo, hasAudio) {
       this.streamInfo = streamInfo
       this.hasAudio = hasAudio
       this.isLoging = false
-      // this.videoUrl = streamInfo.rtc;
-      this.videoUrl = this.getUrlByStreamInfo()
+      this.videoUrl = this.getUrlByStreamInfo(streamInfo)
       this.streamId = streamInfo.stream
       this.app = streamInfo.app
       this.mediaServerId = streamInfo.mediaServerId
-      this.playFromStreamInfo(false, streamInfo)
+      this.showVideoDialog = true
+      this.$nextTick(() => {
+        if (this.$refs.playerTabs) {
+          this.$refs.playerTabs.play(this.videoUrl)
+        }
+      })
     },
     getUrlByStreamInfo(streamInfo) {
-      streamInfo = streamInfo || this.streamInfo
-      if (!streamInfo) {
-        return ''
-      }
-      if (streamInfo.transcodeStream) {
-        streamInfo = streamInfo.transcodeStream
-      }
-      let videoUrl
+      const info = streamInfo || this.streamInfo
+      if (!info) return ''
+      const src = info.transcodeStream || info
       if (location.protocol === 'https:') {
-        videoUrl = streamInfo[this.player[this.activePlayer][1]]
-      } else {
-        videoUrl = streamInfo[this.player[this.activePlayer][0]]
-      }
-      return videoUrl
-    },
-
-    playFromStreamInfo: function(realHasAudio, streamInfo) {
-      this.showVideoDialog = true
-      this.hasaudio = realHasAudio && this.hasaudio
-      console.log(66666666)
-      if (this.$refs[this.activePlayer]) {
-        this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
-      } else {
-        this.$nextTick(() => {
-          this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
-        })
+        return src['wss_flv']
       }
+      return src['ws_flv']
     },
     close: function() {
-      console.log('关闭视频')
-      if (this.$refs[this.activePlayer]) {
-        this.$refs[this.activePlayer].pause()
+      if (this.$refs.playerTabs) {
+        this.$refs.playerTabs.stop()
       }
       this.videoUrl = ''
       this.showVideoDialog = false
       this.stopBroadcast()
     },
-    ptzCamera: function(command) {
-      console.log('云台控制：' + command)
-      this.$store.dispatch('frontEnd/ptz',
-        [
-          this.deviceId,
-          this.channelId,
-          command,
-          parseInt(this.controSpeed * 255 / 100),
-          parseInt(this.controSpeed * 255 / 100),
-          parseInt(this.controSpeed * 15 / 100)
-        ])
-    },
-    irisCamera: function(command) {
-      this.$store.dispatch('frontEnd/iris',
-        [
-          this.deviceId,
-          this.channelId,
-          command,
-          parseInt(this.controSpeed * 255 / 100)
-        ])
-    },
-    focusCamera: function(command) {
-      this.$store.dispatch('frontEnd/focus',
-        [
-          this.deviceId,
-          this.channelId,
-          command,
-          parseInt(this.controSpeed * 255 / 100)
-        ])
-    },
-    // ////////////////////播放器事件处理//////////////////////////
     videoError: function(e) {
       console.log('播放器错误：' + JSON.stringify(e))
     },
     copyUrl: function(dropdownItem) {
-      console.log(dropdownItem)
-      this.$copyText(dropdownItem).then((e) => {
-        this.$message.success({
-          showClose: true,
-          message: '成功拷贝到粘贴板'
-        })
-      }, (e) => {
-
-      })
+      this.$copyText(dropdownItem).then(() => {
+        this.$message.success({ showClose: true, message: '成功拷贝到粘贴板' })
+      }, () => {})
     },
     getBroadcastStatus() {
-      if (this.broadcastStatus == -2) {
-        return 'primary'
-      }
-      if (this.broadcastStatus == -1) {
-        return 'primary'
-      }
-      if (this.broadcastStatus == 0) {
-        return 'warning'
-      }
-      if (this.broadcastStatus === 1) {
-        return 'danger'
-      }
+      if (this.broadcastStatus == -2) return 'primary'
+      if (this.broadcastStatus == -1) return 'primary'
+      if (this.broadcastStatus == 0) return 'warning'
+      if (this.broadcastStatus === 1) return 'danger'
     },
     broadcastStatusClick() {
       if (this.broadcastStatus === -1) {
-        // 默认状态， 开始
         this.broadcastStatus = 0
-        // 发起语音对讲
         this.$store.dispatch('play/broadcastStart', [this.deviceId, this.channelId, this.broadcastMode])
           .then(data => {
-            const streamInfo = data.streamInfo
+            const si = data.streamInfo
             if (document.location.protocol.includes('https')) {
-              this.startBroadcast(streamInfo.rtcs)
+              this.startBroadcast(si.rtcs)
             } else {
-              this.startBroadcast(streamInfo.rtc)
+              this.startBroadcast(si.rtc)
             }
           })
       } else if (this.broadcastStatus === 1) {
@@ -592,86 +281,28 @@ export default {
       }
     },
     startBroadcast(url) {
-      // 获取推流鉴权Key
       this.$store.dispatch('user/getUserInfo')
         .then((data) => {
-          if (data === null) {
-            this.broadcastStatus = -1
-            return
-          }
+          if (data === null) { this.broadcastStatus = -1; return }
           const pushKey = data.pushKey
-          // 获取推流鉴权KEY
           url += '&sign=' + crypto.createHash('md5').update(pushKey, 'utf8').digest('hex')
-          console.log('开始语音喊话： ' + url)
           this.broadcastRtc = new ZLMRTCClient.Endpoint({
-            debug: true, // 是否打印日志
-            zlmsdpUrl: url, // 流地址
-            simulecast: false,
-            useCamera: false,
-            audioEnable: true,
-            videoEnable: false,
-            recvOnly: false
+            debug: true, zlmsdpUrl: url, simulecast: false, useCamera: false,
+            audioEnable: true, videoEnable: false, recvOnly: false
           })
-
-          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT, (e) => { // 获取到了本地流
-            console.error('不支持webrtc', e)
-            this.$message({
-              showClose: true,
-              message: '不支持webrtc, 无法进行语音喊话',
-              type: 'error'
-            })
-            this.broadcastStatus = -1
+          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT, () => { this.broadcastStatus = -1 })
+          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, () => { this.broadcastStatus = -1 })
+          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, () => { this.broadcastStatus = -1 })
+          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, (e) => {
+            if (e === 'connecting') this.broadcastStatus = 0
+            else if (e === 'connected') this.broadcastStatus = 1
+            else if (e === 'disconnected') this.broadcastStatus = -1
           })
-
-          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, (e) => { // ICE 协商出错
-            console.error('ICE 协商出错')
-            this.$message({
-              showClose: true,
-              message: 'ICE 协商出错',
-              type: 'error'
-            })
-            this.broadcastStatus = -1
-          })
-
-          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, (e) => { // offer anwser 交换失败
-            console.error('offer anwser 交换失败', e)
-            this.$message({
-              showClose: true,
-              message: 'offer anwser 交换失败' + e,
-              type: 'error'
-            })
-            this.broadcastStatus = -1
-          })
-          this.broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, (e) => { // offer anwser 交换失败
-            console.log('状态改变', e)
-            if (e === 'connecting') {
-              this.broadcastStatus = 0
-            } else if (e === 'connected') {
-              this.broadcastStatus = 1
-            } else if (e === 'disconnected') {
-              this.broadcastStatus = -1
-            }
-          })
-          this.broadcastRtc.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED, (e) => { // offer anwser 交换失败
-            console.log('捕获流失败', e)
-            this.$message({
-              showClose: true,
-              message: '捕获流失败' + e,
-              type: 'error'
-            })
-            this.broadcastStatus = -1
-          })
-        }).catch(e => {
-          this.$message({
-            showClose: true,
-            message: e,
-            type: 'error'
-          })
-          this.broadcastStatus = -1
-        })
+          this.broadcastRtc.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED, () => { this.broadcastStatus = -1 })
+        }).catch(() => { this.broadcastStatus = -1 })
     },
     stopBroadcast() {
-      this.broadcastRtc.close()
+      this.broadcastRtc && this.broadcastRtc.close()
       this.broadcastStatus = -1
       this.$store.dispatch('play/broadcastStop', [this.deviceId, this.channelId])
     }
@@ -680,204 +311,17 @@ export default {
 </script>
 
 <style>
-.control-wrapper {
-  position: relative;
-  width: 6.25rem;
-  height: 6.25rem;
-  max-width: 6.25rem;
-  max-height: 6.25rem;
-  border-radius: 100%;
-  margin-top: 1.5rem;
-  margin-left: 0.5rem;
-  float: left;
-}
-
-.control-panel {
-  position: relative;
-  top: 0;
-  left: 5rem;
-  height: 11rem;
-  max-height: 11rem;
-}
-
-.control-btn {
-  display: flex;
-  justify-content: center;
-  position: absolute;
-  width: 44%;
-  height: 44%;
-  border-radius: 5px;
-  border: 1px solid #78aee4;
-  box-sizing: border-box;
-  transition: all 0.3s linear;
-}
-
-.control-btn:hover {
-  cursor: pointer
-}
-
-.control-btn i {
-  font-size: 20px;
-  color: #78aee4;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.control-btn i:hover {
-  cursor: pointer
-}
-
-.control-zoom-btn:hover {
-  cursor: pointer
-}
-
-.control-round {
-  position: absolute;
-  top: 21%;
-  left: 21%;
-  width: 58%;
-  height: 58%;
-  background: #fff;
-  border-radius: 100%;
-}
-
-.control-round-inner {
-  position: absolute;
-  left: 13%;
-  top: 13%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 70%;
-  height: 70%;
-  font-size: 40px;
-  color: #78aee4;
-  border: 1px solid #78aee4;
-  border-radius: 100%;
-  transition: all 0.3s linear;
-}
-
-.control-inner-btn {
-  position: absolute;
-  width: 60%;
-  height: 60%;
-  background: #fafafa;
-}
-
-.control-top {
-  top: -8%;
-  left: 27%;
-  transform: rotate(-45deg);
-  border-radius: 5px 100% 5px 0;
-}
-
-.control-top i {
-  transform: rotate(45deg);
-  border-radius: 5px 100% 5px 0;
-}
-
-.control-top .control-inner {
-  left: -1px;
-  bottom: 0;
-  border-top: 1px solid #78aee4;
-  border-right: 1px solid #78aee4;
-  border-radius: 0 100% 0 0;
-}
-
-.control-top .fa {
-  transform: rotate(45deg) translateY(-7px);
-}
-
-.control-left {
-  top: 27%;
-  left: -8%;
-  transform: rotate(45deg);
-  border-radius: 5px 0 5px 100%;
-}
-
-.control-left i {
-  transform: rotate(-45deg);
-}
-
-.control-left .control-inner {
-  right: -1px;
-  top: -1px;
-  border-bottom: 1px solid #78aee4;
-  border-left: 1px solid #78aee4;
-  border-radius: 0 0 0 100%;
-}
-
-.control-left .fa {
-  transform: rotate(-45deg) translateX(-7px);
-}
-
-.control-right {
-  top: 27%;
-  right: -8%;
-  transform: rotate(45deg);
-  border-radius: 5px 100% 5px 0;
-}
-
-.control-right i {
-  transform: rotate(-45deg);
-}
-
-.control-right .control-inner {
-  left: -1px;
-  bottom: -1px;
-  border-top: 1px solid #78aee4;
-  border-right: 1px solid #78aee4;
-  border-radius: 0 100% 0 0;
-}
-
-.control-right .fa {
-  transform: rotate(-45deg) translateX(7px);
-}
-
-.control-bottom {
-  left: 27%;
-  bottom: -8%;
-  transform: rotate(45deg);
-  border-radius: 0 5px 100% 5px;
-}
-
-.control-bottom i {
-  transform: rotate(-45deg);
-}
-
-.control-bottom .control-inner {
-  top: -1px;
-  left: -1px;
-  border-bottom: 1px solid #78aee4;
-  border-right: 1px solid #78aee4;
-  border-radius: 0 0 100% 0;
-}
-
-.control-bottom .fa {
-  transform: rotate(-45deg) translateY(7px);
-}
-
-.trank {
-  width: 80%;
-  height: 180px;
-  text-align: left;
-  padding: 0 10%;
-  overflow: auto;
-}
-
-.trankInfo {
-  width: 80%;
-  padding: 0 10%;
-}
-.el-dialog__body{
-  padding: 10px 20px;
-}
-.ptz-btn-box {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  padding: 0 2rem;
-  height: 3rem;
-  line-height: 4rem;
-}
+#devicePlayer .el-dialog { margin-top: 2vh !important; }
+#devicePlayer .el-dialog__body { padding: 10px 20px; }
+.dhsdk-player-body { display: flex; gap: 16px; }
+.player-side { flex: 3; min-width: 0; }
+.player-container { width: 100%; }
+.control-side { flex: 2; min-width: 340px; display: flex; flex-direction: column; }
+.ptz-section { flex-shrink: 0; margin-bottom: 8px; }
+.control-tabs { flex: 1; display: flex; flex-direction: column; }
+.control-tabs .el-tabs__content { flex: 1; overflow: auto; }
+.media-info-content { overflow: auto; }
+.media-row { display: flex; margin-bottom: 0.5rem; height: 2.5rem; }
+.media-label { width: 6rem; line-height: 2.5rem; text-align: right; flex-shrink: 0; }
+.trank { width: 80%; height: 180px; text-align: left; padding: 0 10%; overflow: auto; }
 </style>