Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-03 43ef195543c087d88ac3eea98067b81d7e2b10c2

 web_src/src/router/index.js

@@ -2,12 +2,13 @@
import VueRouter from 'vue-router'
import Layout from "../layout/index.vue"

import control from '../components/control.vue'
import console from '../components/console.vue'
import deviceList from '../components/DeviceList.vue'
import channelList from '../components/channelList.vue'
import gbRecordDetail from '../components/GBRecordDetail.vue'
import pushVideoList from '../components/PushVideoList.vue'
import streamProxyList from '../components/StreamProxyList.vue'
import devicePosition from  '../components/devicePosition.vue'
import map from '../components/map.vue'
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'
import cloudRecord from '../components/CloudRecord.vue'
@@ -17,6 +18,7 @@
import media from '../components/setting/Media.vue'
import live from '../components/live.vue'
import deviceTree from '../components/common/DeviceTree.vue'
import userManager from '../components/UserManager.vue'

import wasmPlayer from '../components/common/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'
@@ -36,11 +38,11 @@
      path: '/',
      name: 'home',
      component: Layout,
      redirect: '/control',
      redirect: '/console',
      children: [
        {
          path: '/control',
          component: control,
          path: '/console',
          component: console,
        },
        {
          path: '/live',
@@ -59,9 +61,14 @@
          component: streamProxyList,
        },
        {
          path: '/channelList/:deviceId/:parentChannelId/:count/:page',
          path: '/channelList/:deviceId/:parentChannelId/',
          name: 'channelList',
          component: channelList,
        },
        {
          path: '/gbRecordDetail/:deviceId/:channelId/',
          name: 'gbRecordDetail',
          component: gbRecordDetail,
        },
        {
          path: '/parentPlatformList/:count/:page',
@@ -69,9 +76,9 @@
          component: parentPlatformList,
        },
        {
          path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
          name: 'devicePosition',
          component: devicePosition,
          path: '/map/:deviceId/:parentChannelId/:count/:page',
          name: 'map',
          component: map,
        },
        {
          path: '/cloudRecord',
@@ -100,9 +107,14 @@
        },
        {
          path: '/map',
          name: 'devicePosition',
          component: devicePosition,
          name: 'map',
          component: map,
        },
        {
          path: '/userManager',
          name: 'userManager',
          component: userManager,
        }
        ]
    },
    {