|
@@ -33,16 +33,21 @@
|
|
|
</div>
|
|
|
|
|
|
<!-- 用户名下拉菜单 -->
|
|
|
- <el-dropdown class="user-name" trigger="click">
|
|
|
- <span class="el-dropdown-link">
|
|
|
- {{username}}
|
|
|
- <el-icon color="#ffffff" :size="16"><CaretBottom/></el-icon>
|
|
|
- </span>
|
|
|
+ <el-dropdown class="user-name" trigger="click" @command="handleCommand">
|
|
|
+ <div>
|
|
|
+ <el-tooltip effect="dark" :content="app.takeSetting('usName')">
|
|
|
+ <div class="el-dropdown-link">
|
|
|
+ {{app.takeSetting("usName")}}
|
|
|
+ </div>
|
|
|
+ </el-tooltip>
|
|
|
+ <el-icon color="#ffffff" :size="16"><CaretBottom/></el-icon>
|
|
|
+ </div>
|
|
|
+
|
|
|
<template #dropdown>
|
|
|
<el-dropdown-menu>
|
|
|
|
|
|
- <el-dropdown-item>Action 1</el-dropdown-item>
|
|
|
- <el-dropdown-item>Action 2</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="modifypwd">修改密码</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="logout">退出系统</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</template>
|
|
|
</el-dropdown>
|
|
@@ -57,6 +62,7 @@
|
|
|
import { useRouter } from "vue-router"
|
|
|
import headerAPI from "../api/header.js"
|
|
|
import navmenuItem from "./NavmenuItem.vue"
|
|
|
+ import app from "../utils/app.js"
|
|
|
|
|
|
const store=useHomeStore()
|
|
|
|
|
@@ -84,27 +90,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
- const username=ref('测试用户')
|
|
|
|
|
|
- const message=ref(2)
|
|
|
|
|
|
- //const store = useStore();
|
|
|
+ const message=ref(2)
|
|
|
|
|
|
- //const collapse = computed(() => store.state.collapse);
|
|
|
const { collapse } = storeToRefs(store)
|
|
|
|
|
|
const collapseChage = () => {
|
|
|
- //store.commit("handleCollapse", !collapse.value);
|
|
|
- collapse.value=!collapse.value
|
|
|
+ collapse.value=!collapse.value
|
|
|
};
|
|
|
|
|
|
// 用户名下拉菜单选择事件
|
|
|
const router = useRouter();
|
|
|
const handleCommand = (command) => {
|
|
|
- if (command == "loginout") {
|
|
|
- localStorage.removeItem("ms_username");
|
|
|
- router.push("/login");
|
|
|
- } else if (command == "user") {
|
|
|
+ if (command == "logout") {
|
|
|
+ headerAPI.logout(app.takeSetting('token'))
|
|
|
+ app.clearSetting()
|
|
|
+ router.push("/login")
|
|
|
+
|
|
|
+ } else if (command == "modifypwd") {
|
|
|
router.push("/user");
|
|
|
}
|
|
|
};
|
|
@@ -148,7 +152,7 @@
|
|
|
|
|
|
|
|
|
line-height: 60px;
|
|
|
- width:calc(100vw - 402px);
|
|
|
+ width:calc(100vw - 422px);
|
|
|
}
|
|
|
.header .nav-menu:deep(.el-menu--horizontal){
|
|
|
border:none;
|
|
@@ -163,7 +167,7 @@
|
|
|
|
|
|
.header-right {
|
|
|
float: right;
|
|
|
- padding-right: 20px;
|
|
|
+ padding-right: 5px;
|
|
|
|
|
|
}
|
|
|
.header-user-con {
|
|
@@ -200,12 +204,17 @@
|
|
|
}
|
|
|
.user-name {
|
|
|
margin-left: 10px;
|
|
|
- width:80px;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
.el-dropdown-link {
|
|
|
color: #fff;
|
|
|
cursor: pointer;
|
|
|
+ max-width:95px;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow:ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+ display: inline-block;
|
|
|
}
|
|
|
.el-dropdown-menu__item {
|
|
|
text-align: center;
|