From 1245ae7874fd97c70ec6048f4d90ee70831d17ba Mon Sep 17 00:00:00 2001
From: PengOu <595466820@qq.com>
Date: 星期二, 30 一月 2024 10:59:25 +0800
Subject: [PATCH] Fix 推流列表-> 添加通道 报错: 错误: 字段 "gbStreamId" 不存在 ,改为:gb_stream_id 自测试通过
---
web_src/src/router/index.js | 163 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 100 insertions(+), 63 deletions(-)
diff --git a/web_src/src/router/index.js b/web_src/src/router/index.js
old mode 100644
new mode 100755
index ad573cf..d5e9f7e
--- a/web_src/src/router/index.js
+++ b/web_src/src/router/index.js
@@ -1,23 +1,27 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
+import Layout from "../layout/index.vue"
-import control from '../components/control.vue'
+import console from '../components/console.vue'
import deviceList from '../components/DeviceList.vue'
import channelList from '../components/channelList.vue'
+import gbRecordDetail from '../components/GBRecordDetail.vue'
import pushVideoList from '../components/PushVideoList.vue'
import streamProxyList from '../components/StreamProxyList.vue'
-import devicePosition from '../components/devicePosition.vue'
+import map from '../components/map.vue'
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'
import cloudRecord from '../components/CloudRecord.vue'
+import cloudRecordDetail from '../components/CloudRecordDetail.vue'
import mediaServerManger from '../components/MediaServerManger.vue'
-import test from '../components/test.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 userManager from '../components/UserManager.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
@@ -33,23 +37,96 @@
routes: [
{
path: '/',
- component: control,
- },
- {
- path: '/live',
- component: live,
- },
- {
- path: '/deviceList',
- component: deviceList,
- },
- {
- path: '/pushVideoList',
- component: pushVideoList,
- },
- {
- path: '/streamProxyList',
- component: streamProxyList,
+ name: 'home',
+ component: Layout,
+ redirect: '/console',
+ children: [
+ {
+ path: '/console',
+ component: console,
+ },
+ {
+ path: '/live',
+ component: live,
+ },
+ {
+ path: '/deviceList',
+ component: deviceList,
+ },
+ {
+ path: '/pushVideoList',
+ component: pushVideoList,
+ },
+ {
+ path: '/streamProxyList',
+ component: streamProxyList,
+ },
+ {
+ path: '/channelList/:deviceId/:parentChannelId/',
+ name: 'channelList',
+ component: channelList,
+ },
+ {
+ path: '/gbRecordDetail/:deviceId/:channelId/',
+ name: 'gbRecordDetail',
+ component: gbRecordDetail,
+ },
+ {
+ path: '/parentPlatformList/:count/:page',
+ name: 'parentPlatformList',
+ component: parentPlatformList,
+ },
+ {
+ path: '/map/:deviceId/:parentChannelId/:count/:page',
+ name: 'map',
+ component: map,
+ },
+ {
+ path: '/cloudRecord',
+ name: 'cloudRecord',
+ component: cloudRecord,
+ },
+ {
+ path: '/cloudRecordDetail/:app/:stream',
+ name: 'cloudRecordDetail',
+ component: cloudRecordDetail,
+ },
+ {
+ path: '/cloudRecordDetail/:mediaServerId/:app/:stream',
+ name: 'cloudRecordDetail',
+ component: cloudRecordDetail,
+ },
+ {
+ path: '/mediaServerManger',
+ name: 'mediaServerManger',
+ component: mediaServerManger,
+ },
+ {
+ path: '/setting/web',
+ name: 'web',
+ component: web,
+ },
+ {
+ path: '/setting/sip',
+ name: 'sip',
+ component: sip,
+ },
+ {
+ path: '/setting/media',
+ name: 'media',
+ component: media,
+ },
+ {
+ path: '/map',
+ name: 'map',
+ component: map,
+ },
+ {
+ path: '/userManager',
+ name: 'userManager',
+ component: userManager,
+ }
+ ]
},
{
path: '/login',
@@ -57,49 +134,9 @@
component: login,
},
{
- path: '/channelList/:deviceId/:parentChannelId/:count/:page',
- name: 'channelList',
- component: channelList,
- },
- {
- path: '/parentPlatformList/:count/:page',
- name: 'parentPlatformList',
- component: parentPlatformList,
- },
- {
- path: '/devicePosition/:deviceId/:parentChannelId/:count/:page',
- name: 'devicePosition',
- component: devicePosition,
- },
- {
- path: '/cloudRecord',
- name: 'cloudRecord',
- component: cloudRecord,
- },
- {
- path: '/mediaServerManger',
- name: 'mediaServerManger',
- component: mediaServerManger,
- },
- {
- path: '/setting/web',
- name: 'web',
- component: web,
- },
- {
- path: '/setting/sip',
- name: 'sip',
- component: sip,
- },
- {
- path: '/setting/media',
- name: 'media',
- component: media,
- },
- {
path: '/test',
- name: 'test',
- component: test,
+ name: 'deviceTree',
+ component: deviceTree,
},
{
path: '/play/wasm/:url',
--
Gitblit v1.8.0