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

648540858

2022-04-20 088419b4d8965e37774a217c5a8135e95fc82c5a

 web_src/src/router/index.js

@@ -16,7 +16,7 @@
import media from '../components/setting/Media.vue'
import live from '../components/live.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
@@ -66,7 +66,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,
    },