From 03ec48e32c9122e1ab0c69ceb6fc56461c697c80 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期日, 14 三月 2021 21:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/router/index.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
index fa4df8c..93ef64d 100644
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -4,6 +4,7 @@
import control from '../components/control.vue'
import videoList from '../components/videoList.vue'
import channelList from '../components/channelList.vue'
+import devicePosition from '../components/devicePosition.vue'
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'
@@ -35,11 +36,16 @@
path: '/channelList/:deviceId/:parentChannelId/:count/:page',
name: 'channelList',
component: channelList,
- },,
+ },
{
- path: '/parentPlatformList/:platformId/:count/:page',
+ path: '/parentPlatformList/:count/:page',
name: 'parentPlatformList',
component: parentPlatformList,
},
+ {
+ path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
+ name: 'devicePosition',
+ component: devicePosition,
+ },
]
})
--
Gitblit v1.8.0