From 965bdc9986ba66b10c2783b514b1cbdd19b29077 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 19 二月 2022 17:08:50 +0800
Subject: [PATCH] !431 修改登录超时刷新页面跳转登录页面还提示重新登录问题 Merge pull request !431 from 也曾为你、像超人/master
---
ruoyi-ui/src/layout/components/Navbar.vue | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index bafb11a..67a53ab 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -2,14 +2,19 @@
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+ <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+ <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
- <el-tooltip content="下载源码" effect="dark" placement="bottom">
- <ruo-yi id="ruoyi" class="right-menu-item hover-effect" />
+ <el-tooltip content="源码地址" effect="dark" placement="bottom">
+ <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
+ </el-tooltip>
+
+ <el-tooltip content="文档地址" effect="dark" placement="bottom">
+ <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -29,11 +34,11 @@
<router-link to="/user/profile">
<el-dropdown-item>个人中心</el-dropdown-item>
</router-link>
- <el-dropdown-item>
- <span @click="setting = true">布局设置</span>
+ <el-dropdown-item @click.native="setting = true">
+ <span>布局设置</span>
</el-dropdown-item>
- <el-dropdown-item divided>
- <span @click="logout">退出登录</span>
+ <el-dropdown-item divided @click.native="logout">
+ <span>退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -44,20 +49,24 @@
<script>
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
+import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
-import RuoYi from '@/components/RuoYi'
+import RuoYiGit from '@/components/RuoYi/Git'
+import RuoYiDoc from '@/components/RuoYi/Doc'
export default {
components: {
Breadcrumb,
+ TopNav,
Hamburger,
Screenfull,
SizeSelect,
Search,
- RuoYi
+ RuoYiGit,
+ RuoYiDoc
},
computed: {
...mapGetters([
@@ -75,6 +84,11 @@
value: val
})
}
+ },
+ topNav: {
+ get() {
+ return this.$store.state.settings.topNav
+ }
}
},
methods: {
@@ -88,9 +102,9 @@
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- location.reload()
+ location.href = '/index';
})
- })
+ }).catch(() => {});
}
}
}
@@ -121,6 +135,11 @@
float: left;
}
+ .topmenu-container {
+ position: absolute;
+ left: 50px;
+ }
+
.errLog-container {
display: inline-block;
vertical-align: top;
--
Gitblit v1.9.2