From 22e1d92a9d8ae6aa257889f882722b8e48648abc Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期一, 18 四月 2022 09:32:20 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/router/index.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index 05ccaf7..05bb1ae 100644
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -10,12 +10,13 @@
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 wasmPlayer from '../components/dialog/easyPlayer.vue'
+import wasmPlayer from '../components/dialog/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'
const originalPush = VueRouter.prototype.push
@@ -32,6 +33,10 @@
{
path: '/',
component: control,
+ },
+ {
+ path: '/live',
+ component: live,
},
{
path: '/deviceList',
@@ -71,6 +76,11 @@
component: cloudRecord,
},
{
+ path: '/mediaServerManger',
+ name: 'mediaServerManger',
+ component: mediaServerManger,
+ },
+ {
path: '/setting/web',
name: 'web',
component: web,
@@ -84,11 +94,6 @@
path: '/setting/media',
name: 'media',
component: media,
- },
- {
- path: '/test',
- name: 'test',
- component: test,
},
{
path: '/play/wasm/:url',
--
Gitblit v1.8.0