From b4048fbe80dba8e7756ae557a15ab60b4f80a44b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 四月 2023 09:09:07 +0800
Subject: [PATCH] 合并开源主线
---
web_src/src/layout/UiHeader.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/web_src/src/layout/UiHeader.vue b/web_src/src/layout/UiHeader.vue
index fa9be3e..3e9cca0 100644
--- a/web_src/src/layout/UiHeader.vue
+++ b/web_src/src/layout/UiHeader.vue
@@ -23,9 +23,9 @@
<!-- </el-submenu>-->
<!-- <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-menu-item>
<el-switch v-model="alarmNotify" inactive-text="鎶ヨ淇℃伅鎺ㄩ��" @change="alarmNotifyChannge"></el-switch>
</el-menu-item>
<el-menu-item @click="changePassword">淇敼瀵嗙爜</el-menu-item>
@@ -39,6 +39,7 @@
<script>
import changePasswordDialog from '../components/dialog/changePassword.vue'
+import userService from '../components/service/UserService'
export default {
name: "UiHeader",
@@ -47,14 +48,17 @@
return {
alarmNotify: false,
sseSource: null,
+ username: userService.getUser().username,
activeIndex: this.$route.path,
- editUser: this.$cookies.get("session").roleId==1
+ editUser: userService.getUser() ? userService.getUser().role.id === 1 : false
};
},
created() {
- console.log(this.$cookies.get("session"))
+ console.log(4444)
+ console.log(JSON.stringify(userService.getUser()))
if (this.$route.path.startsWith("/channelList")) {
this.activeIndex = "/deviceList"
+
}
},
mounted() {
@@ -69,10 +73,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)
@@ -151,16 +158,19 @@
</script>
<style>
#UiHeader .el-switch__label {
- color: white ;
+ color: white;
}
+
.el-menu--popup .el-menu-item .el-switch .el-switch__label {
color: white !important;
}
-#UiHeader .el-switch__label.is-active{
+
+#UiHeader .el-switch__label.is-active {
color: #409EFF;
}
+
#UiHeader .el-menu-item.is-active {
- color: #fff!important;
- background-color: #1890ff!important;
+ color: #fff !important;
+ background-color: #1890ff !important;
}
</style>
--
Gitblit v1.8.0