From c7fa74116c7448d9b1e24b16af2630a79155cb43 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 30 十月 2022 11:55:15 +0800
Subject: [PATCH] 新增返回警告消息提示
---
src/layout/components/Navbar.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c9f516c..8a2605d 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,11 +1,11 @@
<template>
<div class="navbar">
- <hamburger id="hamburger-container" :is-active="getters.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!$store.state.settings.topNav" />
- <top-nav id="topmenu-container" class="topmenu-container" v-if="$store.state.settings.topNav" />
+ <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+ <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!settingsStore.topNav" />
+ <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
<div class="right-menu">
- <template v-if="getters.device !== 'mobile'">
+ <template v-if="appStore.device !== 'mobile'">
<header-search id="header-search" class="right-menu-item" />
<el-tooltip content="婧愮爜鍦板潃" effect="dark" placement="bottom">
@@ -25,7 +25,7 @@
<div class="avatar-container">
<el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
- <img :src="getters.avatar" class="user-avatar" />
+ <img :src="userStore.avatar" class="user-avatar" />
<el-icon><caret-bottom /></el-icon>
</div>
<template #dropdown>
@@ -57,13 +57,16 @@
import HeaderSearch from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
+import useAppStore from '@/store/modules/app'
+import useUserStore from '@/store/modules/user'
+import useSettingsStore from '@/store/modules/settings'
-const store = useStore();
-const router = useRouter();
-const getters = computed(() => store.getters);
+const appStore = useAppStore()
+const userStore = useUserStore()
+const settingsStore = useSettingsStore()
function toggleSideBar() {
- store.dispatch('app/toggleSideBar')
+ appStore.toggleSideBar()
}
function handleCommand(command) {
@@ -85,7 +88,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- store.dispatch('LogOut').then(() => {
+ userStore.logOut().then(() => {
location.href = '/index';
})
}).catch(() => { });
--
Gitblit v1.9.3