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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
old mode 100644
new mode 100755
index 7651a72..d5e9f7e
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -2,15 +2,17 @@
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 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'
@@ -37,11 +39,11 @@
path: '/',
name: 'home',
component: Layout,
- redirect: '/control',
+ redirect: '/console',
children: [
{
- path: '/control',
- component: control,
+ path: '/console',
+ component: console,
},
{
path: '/live',
@@ -65,6 +67,11 @@
component: channelList,
},
{
+ path: '/gbRecordDetail/:deviceId/:channelId/',
+ name: 'gbRecordDetail',
+ component: gbRecordDetail,
+ },
+ {
path: '/parentPlatformList/:count/:page',
name: 'parentPlatformList',
component: parentPlatformList,
@@ -80,6 +87,16 @@
component: cloudRecord,
},
{
+ path: '/cloudRecordDetail/:app/:stream',
+ name: 'cloudRecordDetail',
+ component: cloudRecordDetail,
+ },
+ {
+ path: '/cloudRecordDetail/:mediaServerId/:app/:stream',
+ name: 'cloudRecordDetail',
+ component: cloudRecordDetail,
+ },
+ {
path: '/mediaServerManger',
name: 'mediaServerManger',
component: mediaServerManger,
--
Gitblit v1.8.0