diff --git a/dist.zip b/dist.zip index 60de3c3..7ad1f48 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/router/index.js b/src/router/index.js index 6ba6d5b..715287f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,6 +29,15 @@ const routes = [{ }, component: () => import('@/views/index'), children: [ + { + path: 'videoWall', + name: 'videoWall', + meta: { + icon: 'desktop', + name: '视频墙' + }, + component: () => import('@/views/videoWall/index'), + }, { path: 'realTimeMonitoring', name: 'realTimeMonitoring', @@ -119,15 +128,7 @@ const routes = [{ }, component: () => import('@/views/repertoryManage/index') }, - { - path: 'videoWall', - name: 'videoWall', - meta: { - icon: 'desktop', - name: '视频墙' - }, - component: () => import('@/views/videoWall/index'), - }, + { path: 'cameraManage/ioTable', name: 'ioTable', diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue index e0a0874..2fa558c 100644 --- a/src/views/cameraManage/model.vue +++ b/src/views/cameraManage/model.vue @@ -348,7 +348,7 @@ export default { if(video){ let player = new WebRtcPlayer(video,'camera'+id); console.log("okkkkkk") - player.load('camera'+id); + //player.load('camera'+id); this.player = player } diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue index e18c813..6242f84 100644 --- a/src/views/realTimeMonitoring/index.vue +++ b/src/views/realTimeMonitoring/index.vue @@ -115,7 +115,7 @@ export default { if(video){ console.log("play:"+b.id) let player = new WebRtcPlayer(video,'camera'+b.id); - player.play('camera'+b.id); + //player.play('camera'+b.id); this.players.push(player) } diff --git a/src/views/videoWall/index.vue b/src/views/videoWall/index.vue index 841f07e..14dc112 100644 --- a/src/views/videoWall/index.vue +++ b/src/views/videoWall/index.vue @@ -111,7 +111,7 @@ export default { console.log("idName:"+idName); let video = document.getElementById(idName); let player = new WebRtcPlayer(video,"camera"+cameras[i-1].id); - player.play('camera'+cameras[i-1].id); + //player.play('camera'+cameras[i-1].id); } }