From cb897aaeed0f3a24f91dc4265b8ff0d2b31284c6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 17:35:00 +0800
Subject: [PATCH] Merge pull request #829 from kairlec/wvp-28181-2.0
---
web_src/src/layout/UiHeader.vue | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/web_src/src/layout/UiHeader.vue b/web_src/src/layout/UiHeader.vue
index 10410bd..2cdca02 100644
--- a/web_src/src/layout/UiHeader.vue
+++ b/web_src/src/layout/UiHeader.vue
@@ -1,26 +1,33 @@
<template>
<div id="UiHeader">
- <el-menu router :default-active="activeIndex" menu-trigger="click" background-color="#545c64" text-color="#fff"
- active-text-color="#ffd04b" mode="horizontal">
- <el-menu-item index="/control">鎺у埗鍙�</el-menu-item>
- <el-menu-item index="/live">瀹炴椂鐩戞帶</el-menu-item>
+
+ <el-menu router :default-active="activeIndex" menu-trigger="click" background-color="#001529" text-color="#fff"
+ active-text-color="#1890ff" mode="horizontal">
+
+ <el-menu-item index="/console">鎺у埗鍙�</el-menu-item>
+ <el-menu-item index="/live">鍒嗗睆鐩戞帶</el-menu-item>
<el-menu-item index="/deviceList">鍥芥爣璁惧</el-menu-item>
+ <el-menu-item index="/map">鐢靛瓙鍦板浘</el-menu-item>
<el-menu-item index="/pushVideoList">鎺ㄦ祦鍒楄〃</el-menu-item>
<el-menu-item index="/streamProxyList">鎷夋祦浠ｇ悊</el-menu-item>
<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 @click="openDoc">鍦ㄧ嚎鏂囨。</el-menu-item>
+ <el-menu-item v-if="editUser" index="/userManager">鐢ㄦ埛绠＄悊</el-menu-item>
+
<!-- <el-submenu index="/setting">-->
<!-- <template slot="title">绯荤粺璁剧疆</template>-->
<!-- <el-menu-item index="/setting/web">WEB鏈嶅姟</el-menu-item>-->
<!-- <el-menu-item index="/setting/sip">鍥芥爣鏈嶅姟</el-menu-item>-->
<!-- <el-menu-item index="/setting/media">濯掍綋鏈嶅姟</el-menu-item>-->
<!-- </el-submenu>-->
- <el-switch v-model="alarmNotify" active-text="鎶ヨ淇℃伅鎺ㄩ��" @change="alarmNotifyChannge"></el-switch>
<!-- <el-menu-item style="float: right;" @click="loginout">閫�鍑�</el-menu-item>-->
<el-submenu index="" style="float: right;">
- <template slot="title">娆㈣繋锛寋{ this.$cookies.get("session").username }}</template>
+ <template slot="title">娆㈣繋锛寋{ username }}</template>
+ <el-menu-item @click="openDoc">鍦ㄧ嚎鏂囨。</el-menu-item>
+ <el-menu-item>
+ <el-switch v-model="alarmNotify" inactive-text="鎶ヨ淇℃伅鎺ㄩ��" @change="alarmNotifyChannge"></el-switch>
+ </el-menu-item>
<el-menu-item @click="changePassword">淇敼瀵嗙爜</el-menu-item>
<el-menu-item @click="loginout">娉ㄩ攢</el-menu-item>
</el-submenu>
@@ -32,6 +39,8 @@
<script>
import changePasswordDialog from '../components/dialog/changePassword.vue'
+import userService from '../components/service/UserService'
+import {Notification} from 'element-ui';
export default {
name: "UiHeader",
@@ -40,14 +49,18 @@
return {
alarmNotify: false,
sseSource: null,
+ username: userService.getUser().username,
activeIndex: this.$route.path,
+ editUser: userService.getUser() ? userService.getUser().role.id === 1 : false
};
},
created() {
+ console.log(4444)
+ console.log(JSON.stringify(userService.getUser()))
if (this.$route.path.startsWith("/channelList")) {
this.activeIndex = "/deviceList"
- }
+ }
},
mounted() {
window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
@@ -61,10 +74,13 @@
method: 'get',
url: "/api/user/logout"
}).then((res) => {
- // 鍒犻櫎cookie锛屽洖鍒扮櫥褰曢〉闈�
- this.$cookies.remove("session");
+ // 鍒犻櫎鐢ㄦ埛淇℃伅锛屽洖鍒扮櫥褰曢〉闈�
+ userService.clearUserInfo()
this.$router.push('/login');
- this.sseSource.close();
+ if (this.sseSource != null) {
+ this.sseSource.close();
+ }
+
}).catch((error) => {
console.error("鐧诲嚭澶辫触")
console.error(error)
@@ -145,7 +161,17 @@
#UiHeader .el-switch__label {
color: white;
}
-#UiHeader .el-switch__label.is-active{
+
+.el-menu--popup .el-menu-item .el-switch .el-switch__label {
+ color: white !important;
+}
+
+#UiHeader .el-switch__label.is-active {
color: #409EFF;
}
+
+#UiHeader .el-menu-item.is-active {
+ color: #fff !important;
+ background-color: #1890ff !important;
+}
</style>
--
Gitblit v1.8.0