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

648540858

2022-04-21 190fc62b7297443cafa8db9c47fd8a9b74339876

 web_src/src/router/index.js

@@ -1,5 +1,6 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
import Layout from "../layout/index.vue"

import control from '../components/control.vue'
import deviceList from '../components/DeviceList.vue'
@@ -33,6 +34,12 @@
  routes: [
    {
      path: '/',
      name: 'home',
      component: Layout,
      redirect: '/control',
      children: [
        {
          path: '/control',
      component: control,
    },
    {
@@ -52,11 +59,6 @@
      component: streamProxyList,
    },
    {
      path: '/login',
      name: '登录',
      component: login,
    },
    {
      path: '/channelList/:deviceId/:parentChannelId/:count/:page',
      name: 'channelList',
      component: channelList,
@@ -67,17 +69,7 @@
      component: parentPlatformList,
    },
    {
      path: '/devicePosition',
      name: 'devicePosition',
      component: devicePosition,
    },
    {
      path: '/devicePosition/:deviceId',
      name: 'devicePosition',
      component: devicePosition,
    },
    {
      path: '/devicePosition/:deviceId/:parentChannelId',
          path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
      name: 'devicePosition',
      component: devicePosition,
    },
@@ -116,6 +108,13 @@
      name: 'rtcPlayer',
      component: rtcPlayer,
    },
        ]
    },
    {
      path: '/login',
      name: '登录',
      component: login,
    },
    {
      path: '/test',
      name: 'deviceTree',