From 1179a7ad0297f65ddd82b7324ac619f7800cf5af Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 四月 2022 16:58:33 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/router/index.js | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index 414987b..5a1d964 100644
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -16,8 +16,9 @@
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
@@ -97,22 +98,32 @@
name: 'media',
component: media,
},
+ {
+ path: '/play/wasm/:url',
+ name: 'wasmPlayer',
+ component: wasmPlayer,
+ },
+ {
+ path: '/play/rtc/:url',
+ name: 'rtcPlayer',
+ component: rtcPlayer,
+ },
+ {
+ path: '/map',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
]
- },
- {
- path: '/play/wasm/:url',
- name: 'wasmPlayer',
- component: wasmPlayer,
- },
- {
- path: '/play/rtc/:url',
- name: 'rtcPlayer',
- component: rtcPlayer,
},
{
path: '/login',
name: '鐧诲綍',
component: login,
},
+ {
+ path: '/test',
+ name: 'deviceTree',
+ component: deviceTree,
+ },
]
})
--
Gitblit v1.8.0