From 088419b4d8965e37774a217c5a8135e95fc82c5a Mon Sep 17 00:00:00 2001 From: 648540858 <456panlinlin> Date: 星期三, 20 四月 2022 09:38:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map --- web_src/src/router/index.js | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js index 05bb1ae..3869fa3 100644 --- a/web_src/src/router/index.js +++ b/web_src/src/router/index.js @@ -16,7 +16,7 @@ import media from '../components/setting/Media.vue' import live from '../components/live.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 @@ -66,7 +66,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, }, -- Gitblit v1.8.0