Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

648540858

2022-04-21 d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e

 web_src/src/router/index.js

@@ -11,13 +11,13 @@
import parentPlatformList from '../components/ParentPlatformList.vue'
import cloudRecord from '../components/CloudRecord.vue'
import mediaServerManger from '../components/MediaServerManger.vue'
import test from '../components/test.vue'
import web from '../components/setting/Web.vue'
import sip from '../components/setting/Sip.vue'
import media from '../components/setting/Media.vue'
import live from '../components/live.vue'
import deviceTree from '../components/common/DeviceTree.vue'

import wasmPlayer from '../components/dialog/jessibuca.vue'
import wasmPlayer from '../components/common/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'

const originalPush = VueRouter.prototype.push
@@ -67,7 +67,17 @@
      component: parentPlatformList,
    },
    {
      path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
      path: '/devicePosition',
      name: 'devicePosition',
      component: devicePosition,
    },
    {
      path: '/devicePosition/:deviceId',
      name: 'devicePosition',
      component: devicePosition,
    },
    {
      path: '/devicePosition/:deviceId/:parentChannelId',
      name: 'devicePosition',
      component: devicePosition,
    },
@@ -97,11 +107,6 @@
      component: media,
    },
    {
      path: '/test',
      name: 'test',
      component: test,
    },
    {
      path: '/play/wasm/:url',
      name: 'wasmPlayer',
      component: wasmPlayer,
@@ -111,5 +116,10 @@
      name: 'rtcPlayer',
      component: rtcPlayer,
    },
    {
      path: '/test',
      name: 'deviceTree',
      component: deviceTree,
    },
  ]
})