From d8b570430066fae42d6884671cef541fc820de1c Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 15 十一月 2024 14:42:44 +0800
Subject: [PATCH] 动态路由
---
src/layout/components/Navbar.vue | 73 +++++++-----------------------------
1 files changed, 15 insertions(+), 58 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2cb8830..4c30253 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -16,7 +16,7 @@
<!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
- <screenfull id="screenfull" class="right-menu-item hover-effect" />
+<!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
<!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">-->
<!-- <size-select id="size-select" class="right-menu-item hover-effect" />-->
@@ -25,8 +25,7 @@
<div class="avatar-container">
<el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
-<!-- <img :src="userStore.avatar" class="user-avatar" />-->
- <img src="../../assets/images/avator.png" class="user-avatar" />
+ <img :src="avator" class="user-avatar" />
<el-icon><caret-bottom /></el-icon>
</div>
<template #dropdown>
@@ -34,13 +33,10 @@
<!-- <router-link to="/user/profile">-->
<!-- <el-dropdown-item>个人中心</el-dropdown-item>-->
<!-- </router-link>-->
- <el-dropdown-item command="info">
- <span>基本信息</span>
- </el-dropdown-item>
- <el-dropdown-item command="password">
- <span>修改密码</span>
- </el-dropdown-item>
- <el-dropdown-item divided command="logout">
+<!-- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">-->
+<!-- <span>布局设置</span>-->
+<!-- </el-dropdown-item>-->
+ <el-dropdown-item command="logout">
<span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
@@ -48,8 +44,6 @@
</el-dropdown>
</div>
</div>
- <review-dialog ref="reviewRef" ></review-dialog>
- <supervise-dialog ref="superRef"></supervise-dialog>
</div>
</template>
@@ -66,65 +60,28 @@
import useAppStore from '@/store/modules/app'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
-import {getToken, removeToken} from "@/utils/auth";
-import {onMounted, ref} from "vue";
-import Cookies from "js-cookie";
-import reviewDialog from "@/views/safetyReview/institution/components/viewInstitution.vue"
-import superviseDialog from "@/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue"
+import avator from '@/assets/images/avator.png'
+
const appStore = useAppStore()
const userStore = useUserStore()
const settingsStore = useSettingsStore()
-const reviewRef = ref();
-const superRef = ref();
-const userInfo = ref();
-onMounted(()=>{
- if(getToken()){
- userInfo.value = JSON.parse(Cookies.get('userInfo'))
- console.log("userInfo",userInfo.value )
-
- }
-})
function toggleSideBar() {
appStore.toggleSideBar()
}
function handleCommand(command) {
switch (command) {
- case "info":
- getInfo();
+ case "setLayout":
+ setLayout();
break;
case "logout":
logout();
break;
- case "password":
- editPsd();
- break;
default:
break;
}
-}
-
-function getInfo() {
- console.log("getInfo")
- //机构用户
- if(userInfo.value.identity === 1){
- const obj = {
- agencyId: userInfo.value.agentId
- }
- reviewRef.value.openDialog(obj,'view')
- }
- //监管用户
- else if (userInfo.value.identity === 0) {
- const obj = {
- id: userInfo.value.id
- }
- superRef.value.openDialog('view', obj);
- }
-}
-function editPsd() {
- superRef.value.openDialog('pwd', userInfo.value);
}
function logout() {
@@ -133,9 +90,9 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- removeToken()
- location.href = '/homePage';
-
+ userStore.logOut().then(() => {
+ location.href = '/index';
+ })
}).catch(() => { });
}
@@ -151,8 +108,8 @@
overflow: hidden;
position: relative;
background: #fff;
- border-radius: 0.4rem 0.4rem 0 0;
- border-bottom: 1px solid #d5dce5;
+ box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+
.hamburger-container {
line-height: 46px;
height: 100%;
--
Gitblit v1.9.2