From 43ef195543c087d88ac3eea98067b81d7e2b10c2 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 03 七月 2023 16:54:09 +0800 Subject: [PATCH] Merge branch '2.6.8' into wvp-28181-2.0 --- web_src/src/router/index.js | 57 ++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 17 deletions(-) diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js index 356bc33..23c0a82 100644 --- a/web_src/src/router/index.js +++ b/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' @@ -16,8 +17,10 @@ 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 userManager from '../components/UserManager.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 @@ -35,11 +38,11 @@ path: '/', name: 'home', component: Layout, - redirect: '/control', + redirect: '/console', children: [ { - path: '/control', - component: control, + path: '/console', + component: console, }, { path: '/live', @@ -58,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', @@ -68,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', @@ -98,15 +106,15 @@ component: media, }, { - path: '/play/wasm/:url', - name: 'wasmPlayer', - component: wasmPlayer, + path: '/map', + name: 'map', + component: map, }, { - path: '/play/rtc/:url', - name: 'rtcPlayer', - component: rtcPlayer, - }, + path: '/userManager', + name: 'userManager', + component: userManager, + } ] }, { @@ -114,5 +122,20 @@ name: '鐧诲綍', component: login, }, + { + path: '/test', + name: 'deviceTree', + component: deviceTree, + }, + { + path: '/play/wasm/:url', + name: 'wasmPlayer', + component: wasmPlayer, + }, + { + path: '/play/rtc/:url', + name: 'rtcPlayer', + component: rtcPlayer, + }, ] }) -- Gitblit v1.8.0