From 404cb4c7a6c8ef6c8ad53893e92b623e4e5e6ed3 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: 星期日, 16 一月 2022 01:06:51 +0800
Subject: [PATCH] fix 重命名通用 数据权限 服务接口类名称，与其他服务接口风格统一
---
ruoyi-ui/src/layout/components/Navbar.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index b11460a..9de102c 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -2,12 +2,13 @@
<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-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
@@ -48,6 +49,7 @@
<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'
@@ -58,6 +60,7 @@
export default {
components: {
Breadcrumb,
+ TopNav,
Hamburger,
Screenfull,
SizeSelect,
@@ -81,6 +84,11 @@
value: val
})
}
+ },
+ topNav: {
+ get() {
+ return this.$store.state.settings.topNav
+ }
}
},
methods: {
@@ -94,9 +102,9 @@
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- location.href = '/index';
+ location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
})
- })
+ }).catch(() => {});
}
}
}
@@ -127,6 +135,11 @@
float: left;
}
+ .topmenu-container {
+ position: absolute;
+ left: 50px;
+ }
+
.errLog-container {
display: inline-block;
vertical-align: top;
--
Gitblit v1.9.3