From 88c1812981756c63fa4e1a268636f36b88a8c1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BD=B3=20=E5=8D=9A?=
<12742597+fang-jiabo@user.noreply.gitee.com>
Date: Sat, 2 Sep 2023 14:23:24 +0800
Subject: [PATCH] =?UTF-8?q?'=E5=A4=B4=E9=83=A8'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/index.scss | 1 +
src/layout/components/Navbar.vue | 31 ++++++++++++++++++-------------
src/settings.js | 2 +-
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index a93cff2..92c096f 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -124,6 +124,7 @@ aside {
//main-container全局样式
.app-container {
padding: 20px;
+ margin-top: 50px;
}
.components-container {
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 8a2605d..29fcc75 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="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+ <!-- <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" />
+ <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" /> -->
<div class="right-menu">
- <template v-if="appStore.device !== 'mobile'">
+ <!-- <template v-if="appStore.device !== 'mobile'">
<header-search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -21,7 +21,7 @@
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
- </template>
+ </template> -->
<div class="avatar-container">
<el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
@@ -49,14 +49,14 @@
<script setup>
import { ElMessageBox } from 'element-plus'
-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 HeaderSearch from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+// 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 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'
@@ -105,8 +105,13 @@ function setLayout() {
height: 50px;
overflow: hidden;
position: relative;
- background: #fff;
+ background: url(../../assets/images/top.png);
+ background-size: 100% 54px !important;
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+ position: fixed;
+ width: 100%;
+ height: 50px;
+ z-index: 1000;
.hamburger-container {
line-height: 46px;
diff --git a/src/settings.js b/src/settings.js
index bd4b9e2..b5e2d68 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -20,7 +20,7 @@ export default {
/**
* 是否显示 tagsView
*/
- tagsView: true,
+ tagsView: false,
/**
* 是否固定头部