From 529f48641122af7c0aec185e4283d02e97aa0f89 Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期三, 19 四月 2023 14:40:51 +0800
Subject: [PATCH] 增加 websocket
---
src/layout/components/Navbar.vue | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 39b3dad..85245cd 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,29 +2,17 @@
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+ <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav && showBreadCrumb"/>
<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>
-
- <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" />
-
- <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">
- <size-select id="size-select" class="right-menu-item hover-effect" />
- </el-tooltip>
-
+<!-- <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">-->
+<!-- <size-select id="size-select" class="right-menu-item hover-effect" />-->
+<!-- </el-tooltip>-->
</template>
-
+ <div class="user-name">{{ name }}</div>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
@@ -48,12 +36,12 @@
<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 Breadcrumb from '@/components/RuoYi/Breadcrumb'
+import TopNav from '@/components/RuoYi/TopNav'
+import Hamburger from '@/components/RuoYi/Hamburger'
+import Screenfull from '@/components/RuoYi/Screenfull'
+import SizeSelect from '@/components/RuoYi/SizeSelect'
+import Search from '@/components/RuoYi/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
@@ -72,6 +60,7 @@
...mapGetters([
'sidebar',
'avatar',
+ 'name',
'device'
]),
setting: {
@@ -91,9 +80,22 @@
}
}
},
+ data(){
+ return {
+ showBreadCrumb:false // 鏄惁鏄剧ず椤堕儴闈㈠寘灞�
+ }
+ },
+
+ created() {
+ this.initTts();
+ },
+
methods: {
+ initTts(){
+ this.$store.dispatch('app/setSpeechTts');
+ },
toggleSideBar() {
- this.$store.dispatch('app/toggleSideBar')
+ this.$store.dispatch('app/toggleSideBar');
},
async logout() {
this.$confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
@@ -111,6 +113,10 @@
</script>
<style lang="scss" scoped>
+.user-name{
+ font-size: 16px;
+ color: #333;
+}
.navbar {
height: 50px;
overflow: hidden;
@@ -149,7 +155,8 @@
float: right;
height: 100%;
line-height: 50px;
-
+ display: flex;
+ align-items: center;
&:focus {
outline: none;
}
@@ -183,14 +190,14 @@
cursor: pointer;
width: 40px;
height: 40px;
- border-radius: 10px;
+ border-radius: 100%;
}
.el-icon-caret-bottom {
cursor: pointer;
position: absolute;
right: -20px;
- top: 25px;
+ top: 15px;
font-size: 12px;
}
}
--
Gitblit v1.9.1