XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 重构/1078

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
#	src/main/resources/application.yml
#	web_src/src/layout/UiHeader.vue
#	web_src/src/router/index.js
This commit is contained in:
648540858
2024-10-18 13:55:23 +08:00
parent 601daa1092 cbd6a57e15
commit 277f2db137
428 changed files with 26104 additions and 22272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web_src/src/router/index.js
View File

@@ -11,11 +11,11 @@ import jtChannelEdit from '../components/JTChannelEdit.vue'
import jtDeviceParams from '../components/JTDeviceParam.vue'
import channelList from '../components/channelList.vue'
import gbRecordDetail from '../components/GBRecordDetail.vue'
import pushVideoList from '../components/PushVideoList.vue'
import streamPushList from '../components/StreamPushList.vue'
import streamProxyList from '../components/StreamProxyList.vue'
import map from '../components/map.vue'
import login from '../components/Login.vue'
import parentPlatformList from '../components/ParentPlatformList.vue'
import platform from '../components/PlatformList.vue'
import cloudRecord from '../components/CloudRecord.vue'
import cloudRecordDetail from '../components/CloudRecordDetail.vue'
import mediaServerManger from '../components/MediaServerManger.vue'
@@ -28,6 +28,8 @@ import userManager from '../components/UserManager.vue'
import userApiKeyManager from '../components/UserApiKeyManager.vue'
import wasmPlayer from '../components/common/jessibuca.vue'
import rtcPlayer from '../components/dialog/rtcPlayer.vue'
import region from '../components/region.vue'
import group from '../components/group.vue'
const originalPush = VueRouter.prototype.push
VueRouter.prototype.push = function push(location) {
@@ -58,6 +60,10 @@ export default new VueRouter({
path: '/deviceList',
component: deviceList,
},
{
path: '/streamPushList',
component: streamPushList,
},
{
path: '/jtDeviceList',
component: jtDeviceList,
@@ -84,6 +90,11 @@ export default new VueRouter({
name: 'gbRecordDetail',
component: gbRecordDetail,
},
{
path: '/platformList/:count/:page',
name: 'platformList',
component: platform,
},
{
path: '/jtRecordDetail/:phoneNumber/:channelId/',
name: 'jtRecordDetail',
@@ -163,6 +174,16 @@ export default new VueRouter({
path: '/userApiKeyManager/:userId',
name: 'userApiKeyManager',
component: userApiKeyManager,
},
{
path: '/channel/region',
name: 'region',
component: region,
},
{
path: '/channel/group',
name: 'group',
component: group,
}
,
]