From d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期四, 21 四月 2022 10:30:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
---
web_src/src/router/index.js | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index 4b0810d..273fa8c 100644
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -10,12 +10,14 @@
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'
import cloudRecord from '../components/CloudRecord.vue'
-import test from '../components/test.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 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
@@ -32,6 +34,10 @@
{
path: '/',
component: control,
+ },
+ {
+ path: '/live',
+ component: live,
},
{
path: '/deviceList',
@@ -61,7 +67,17 @@
component: parentPlatformList,
},
{
- path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
+ path: '/devicePosition',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
+ {
+ path: '/devicePosition/:deviceId',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
+ {
+ path: '/devicePosition/:deviceId/:parentChannelId',
name: 'devicePosition',
component: devicePosition,
},
@@ -69,6 +85,11 @@
path: '/cloudRecord',
name: 'cloudRecord',
component: cloudRecord,
+ },
+ {
+ path: '/mediaServerManger',
+ name: 'mediaServerManger',
+ component: mediaServerManger,
},
{
path: '/setting/web',
@@ -86,11 +107,6 @@
component: media,
},
{
- path: '/test',
- name: 'test',
- component: test,
- },
- {
path: '/play/wasm/:url',
name: 'wasmPlayer',
component: wasmPlayer,
@@ -100,5 +116,10 @@
name: 'rtcPlayer',
component: rtcPlayer,
},
+ {
+ path: '/test',
+ name: 'deviceTree',
+ component: deviceTree,
+ },
]
})
--
Gitblit v1.8.0