修复地图页面视频播放

web/src/views/channel/index.vue

@@ -319,7 +319,7 @@ export default {
       this.$store.dispatch('commonChanel/playChannel', itemData.gbId)
         .then((data) => {
           itemData.streamId = data.stream
-          this.$refs.devicePlayer.openDialog('media', itemData.gbId, itemData.gbId, {
+          this.$refs.devicePlayer.openDialog('media', itemData.gbId, {
             streamInfo: data,
             hasAudio: itemData.hasAudio
           })

web/src/views/channel/player.vue

@@ -67,7 +67,6 @@ export default {
       streamId: '',
       app: '',
       mediaServerId: '',
-      deviceId: '',
       channelId: '',
       tabActiveName: 'preset',
       hasAudio: false,
@@ -90,10 +89,9 @@ export default {
         this.$refs.mediaInfo && this.$refs.mediaInfo.stopTask()
       }
     },
-    openDialog(tab, deviceId, channelId, param) {
+    openDialog(tab, channelId, param) {
       if (this.showVideoDialog) return
       this.tabActiveName = tab || 'preset'
-      this.deviceId = deviceId
       this.channelId = channelId
       this.streamId = ''
       this.mediaServerId = ''
@@ -130,7 +128,6 @@ export default {
     toggleDragZoom(direction) {
       this.dragZoomDirection = direction
       this.$refs.playerTabs.startDragZoom((params) => {
-        params.deviceId = this.deviceId
         params.channelId = this.channelId
         const action = this.dragZoomDirection === 'in' ? 'commonChanel/dragZoomIn' : 'commonChanel/dragZoomOut'
         const successMsg = this.dragZoomDirection === 'in' ? '拉框放大成功' : '拉框缩小成功'

web/src/views/map/index.vue

@@ -115,7 +115,7 @@
           </div>
         </transition>
       </div>
-      <devicePlayer ref="devicePlayer" ></devicePlayer>
+      <player ref="player" ></player>
       <queryTrace ref="queryTrace" ></queryTrace>
       <CommonChannelEditDialog ref="commonChannelEditDialog" ></CommonChannelEditDialog>
       <DrawThinProgress ref="drawThinProgress" ></DrawThinProgress>
@@ -126,14 +126,10 @@
 import DeviceTree from '../common/DeviceTree.vue'
 import queryTrace from './queryTrace.vue'
 import MapComponent from '../common/MapComponent.vue'
-import devicePlayer from '../channel/player.vue'
+import player from '../channel/player.vue'
 import CommonChannelEditDialog from '../dialog/commonChannelEditDialog.vue'
 import DrawThinProgress from './dialog/drawThinProgress.vue'
 
-let cameraListForSource = []
-let cameraList = []
-let cameraListForLevelMap = new Map()
-let cameraLayerExtent = []
 let channelLayer, channelTileLayer = null
 export default {
   name: 'Map',
@@ -141,7 +137,7 @@ export default {
     DrawThinProgress,
     CommonChannelEditDialog,
     DeviceTree,
-    devicePlayer,
+    player,
     queryTrace,
     MapComponent
   },
@@ -362,7 +358,7 @@ export default {
       })
       this.$store.dispatch('commonChanel/playChannel', channel.gbId)
         .then((data) => {
-          this.$refs.devicePlayer.openDialog('media', channel.gbId, {
+          this.$refs.player.openDialog('media', channel.gbId, {
             streamInfo: data,
             hasAudio: channel.hasAudio
           })