From 7de73ebd2bc07a51f0f9db031d6f616bdcfe549c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 11 十月 2023 01:36:12 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
web_src/src/router/index.js | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
old mode 100644
new mode 100755
index 8844862..d5e9f7e
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -2,21 +2,24 @@
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'
+import cloudRecordDetail from '../components/CloudRecordDetail.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 userManager from '../components/UserManager.vue'
import wasmPlayer from '../components/common/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'
@@ -36,11 +39,11 @@
path: '/',
name: 'home',
component: Layout,
- redirect: '/control',
+ redirect: '/console',
children: [
{
- path: '/control',
- component: control,
+ path: '/console',
+ component: console,
},
{
path: '/live',
@@ -59,9 +62,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,14 +77,24 @@
component: parentPlatformList,
},
{
- path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
- name: 'devicePosition',
- component: devicePosition,
+ path: '/map/:deviceId/:parentChannelId/:count/:page',
+ name: 'map',
+ component: map,
},
{
path: '/cloudRecord',
name: 'cloudRecord',
component: cloudRecord,
+ },
+ {
+ path: '/cloudRecordDetail/:app/:stream',
+ name: 'cloudRecordDetail',
+ component: cloudRecordDetail,
+ },
+ {
+ path: '/cloudRecordDetail/:mediaServerId/:app/:stream',
+ name: 'cloudRecordDetail',
+ component: cloudRecordDetail,
},
{
path: '/mediaServerManger',
@@ -100,9 +118,14 @@
},
{
path: '/map',
- name: 'devicePosition',
- component: devicePosition,
+ name: 'map',
+ component: map,
},
+ {
+ path: '/userManager',
+ name: 'userManager',
+ component: userManager,
+ }
]
},
{
--
Gitblit v1.8.0