roouzenn/wvp
Template
1
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

28
web_src/src/layout/UiHeader.vue
View File

@@ -6,14 +6,19 @@
<el-menu-item index="/console">控制台</el-menu-item>
<el-menu-item index="/live">分屏监控</el-menu-item>
<!-- <el-menu-item index="/map">电子地图</el-menu-item>-->
<el-menu-item index="/deviceList">国标设备</el-menu-item>
<el-menu-item index="/jtDeviceList">部标设备</el-menu-item>
<el-menu-item index="/map">电子地图</el-menu-item>
<el-menu-item index="/pushVideoList">推流列表</el-menu-item>
<el-menu-item index="/streamPushList">推流列表</el-menu-item>
<el-menu-item index="/streamProxyList">拉流代理</el-menu-item>
<el-submenu index="/channel">
<template slot="title">通道管理</template>
<el-menu-item index="/channel/region">行政区划</el-menu-item>
<el-menu-item index="/channel/group">业务分组</el-menu-item>
</el-submenu>
<el-menu-item index="/cloudRecord">云端录像</el-menu-item>
<el-menu-item index="/mediaServerManger">节点管理</el-menu-item>
<el-menu-item index="/parentPlatformList/15/1">国标级联</el-menu-item>
<el-menu-item index="/platformList/15/1">国标级联</el-menu-item>
<el-menu-item v-if="editUser" index="/userManager">用户管理</el-menu-item>
<!-- <el-submenu index="/setting">-->
@@ -50,12 +55,15 @@ export default {
alarmNotify: false,
sseSource: null,
username: userService.getUser().username,
activeIndex: this.$route.path,
activeIndex: this.$route.path.indexOf("/", 1)>0?this.$route.path.substring(0, this.$route.path.indexOf("/", 1)):this.$route.path,
editUser: userService.getUser() ? userService.getUser().role.id === 1 : false
};
},
created() {
console.log(JSON.stringify(userService.getUser()))
console.log(34334)
console.log(this.$route.path)
console.log(this.$route.path.indexOf("/", 1))
console.log(this.activeIndex)
if (this.$route.path.startsWith("/channelList")) {
this.activeIndex = "/deviceList"
}
@@ -177,4 +185,14 @@ export default {
color: #fff !important;
background-color: #1890ff !important;
}
#UiHeader .el-submenu.is-active {
background-color: #1890ff !important;
}
#UiHeader .el-submenu.is-active .el-submenu__title {
color: #fff !important;
background-color: #1890ff !important;
}
#UiHeader .el-submenu.is-active .el-submenu__icon-arrow {
color: #fff !important;
}
</style>