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

648540858

2022-04-21 d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e

 web_src/src/router/index.js

@@ -9,12 +9,15 @@
import devicePosition from  '../components/devicePosition.vue'
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'
import test from '../components/test.vue'
import cloudRecord from '../components/CloudRecord.vue'
import mediaServerManger from '../components/MediaServerManger.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/easyPlayer.vue'
import wasmPlayer from '../components/common/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'

const originalPush = VueRouter.prototype.push
@@ -31,6 +34,10 @@
    {
      path: '/',
      component: control,
    },
    {
      path: '/live',
      component: live,
    },
    {
      path: '/deviceList',
@@ -60,9 +67,29 @@
      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,
    },
    {
      path: '/cloudRecord',
      name: 'cloudRecord',
      component: cloudRecord,
    },
    {
      path: '/mediaServerManger',
      name: 'mediaServerManger',
      component: mediaServerManger,
    },
    {
      path: '/setting/web',
@@ -80,11 +107,6 @@
      component: media,
    },
    {
      path: '/test',
      name: 'test',
      component: test,
    },
    {
      path: '/play/wasm/:url',
      name: 'wasmPlayer',
      component: wasmPlayer,
@@ -94,5 +116,10 @@
      name: 'rtcPlayer',
      component: rtcPlayer,
    },
    {
      path: '/test',
      name: 'deviceTree',
      component: deviceTree,
    },
  ]
})