From 9fb7246fec6a216c8a922e3c0ed009a60aeb2bfc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 24 四月 2022 14:52:01 +0800
Subject: [PATCH] Merge pull request #449 from hotcoffie/wvp-28181-2.0
---
web_src/src/router/index.js | 144 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 70 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index 273fa8c..8844862 100644
--- a/web_src/src/router/index.js
+++ b/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,23 +34,76 @@
routes: [
{
path: '/',
- component: control,
- },
- {
- path: '/live',
- component: live,
- },
- {
- path: '/deviceList',
- component: deviceList,
- },
- {
- path: '/pushVideoList',
- component: pushVideoList,
- },
- {
- path: '/streamProxyList',
- component: streamProxyList,
+ name: 'home',
+ component: Layout,
+ redirect: '/control',
+ children: [
+ {
+ path: '/control',
+ component: control,
+ },
+ {
+ path: '/live',
+ component: live,
+ },
+ {
+ path: '/deviceList',
+ component: deviceList,
+ },
+ {
+ path: '/pushVideoList',
+ component: pushVideoList,
+ },
+ {
+ path: '/streamProxyList',
+ component: streamProxyList,
+ },
+ {
+ path: '/channelList/:deviceId/:parentChannelId/:count/:page',
+ name: 'channelList',
+ component: channelList,
+ },
+ {
+ path: '/parentPlatformList/:count/:page',
+ name: 'parentPlatformList',
+ component: parentPlatformList,
+ },
+ {
+ path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
+ {
+ path: '/cloudRecord',
+ name: 'cloudRecord',
+ component: cloudRecord,
+ },
+ {
+ path: '/mediaServerManger',
+ name: 'mediaServerManger',
+ component: mediaServerManger,
+ },
+ {
+ path: '/setting/web',
+ name: 'web',
+ component: web,
+ },
+ {
+ path: '/setting/sip',
+ name: 'sip',
+ component: sip,
+ },
+ {
+ path: '/setting/media',
+ name: 'media',
+ component: media,
+ },
+ {
+ path: '/map',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
+ ]
},
{
path: '/login',
@@ -57,54 +111,9 @@
component: login,
},
{
- path: '/channelList/:deviceId/:parentChannelId/:count/:page',
- name: 'channelList',
- component: channelList,
- },
- {
- path: '/parentPlatformList/:count/:page',
- name: 'parentPlatformList',
- component: parentPlatformList,
- },
- {
- path: '/devicePosition',
- name: 'devicePosition',
- component: devicePosition,
- },
- {
- path: '/devicePosition/:deviceId',
- name: 'devicePosition',
- component: devicePosition,
- },
- {
- path: '/devicePosition/:deviceId/:parentChannelId',
- name: 'devicePosition',
- component: devicePosition,
- },
- {
- path: '/cloudRecord',
- name: 'cloudRecord',
- component: cloudRecord,
- },
- {
- path: '/mediaServerManger',
- name: 'mediaServerManger',
- component: mediaServerManger,
- },
- {
- path: '/setting/web',
- name: 'web',
- component: web,
- },
- {
- path: '/setting/sip',
- name: 'sip',
- component: sip,
- },
- {
- path: '/setting/media',
- name: 'media',
- component: media,
+ path: '/test',
+ name: 'deviceTree',
+ component: deviceTree,
},
{
path: '/play/wasm/:url',
@@ -115,11 +124,6 @@
path: '/play/rtc/:url',
name: 'rtcPlayer',
component: rtcPlayer,
- },
- {
- path: '/test',
- name: 'deviceTree',
- component: deviceTree,
},
]
})
--
Gitblit v1.8.0