From 901be26b0491501afe8eb145392a8d8c307f0138 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 12 十月 2022 16:37:09 +0800
Subject: [PATCH] 新增施工交付其他交付功能
---
src/layout/components/Navbar.vue | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9de102c..267c6d9 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,37 +6,32 @@
<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" />
+ <!--<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>
+ <!--<screenfull id="screenfull" class="right-menu-item hover-effect" />-->
- <el-tooltip content="鏂囨。鍦板潃" effect="dark" placement="bottom">
- <ruo-yi-doc id="ruoyi-doc" 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>-->
- <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>
-
- </template>
+ <!--</template>-->
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
- <div class="avatar-wrapper">
- <img :src="avatar" class="user-avatar">
- <i class="el-icon-caret-bottom" />
+ <div class="avatar-wrapper" style="float: left; font-size: 14px;">
+ <!--<img :src="avatar" class="user-avatar">-->
+ <!--<i class="el-icon-caret-bottom" />-->
+ <i class="el-icon-user" style="margin-right: 5px;"></i>
+ <span style="margin-right: 5px;">{{ user.nickName }}</span>
+ <i class="el-icon-arrow-down"></i>
</div>
<el-dropdown-menu slot="dropdown">
<router-link to="/user/profile">
<el-dropdown-item>涓汉涓績</el-dropdown-item>
</router-link>
- <el-dropdown-item @click.native="setting = true">
- <span>甯冨眬璁剧疆</span>
- </el-dropdown-item>
+ <!--<el-dropdown-item @click.native="setting = true">-->
+ <!--<span>甯冨眬璁剧疆</span>-->
+ <!--</el-dropdown-item>-->
<el-dropdown-item divided @click.native="logout">
<span>閫�鍑虹櫥褰�</span>
</el-dropdown-item>
@@ -56,6 +51,7 @@
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
+import { getUserProfile } from "@/api/system/user";
export default {
components: {
@@ -72,7 +68,8 @@
...mapGetters([
'sidebar',
'avatar',
- 'device'
+ 'device',
+ 'name'
]),
setting: {
get() {
@@ -91,7 +88,20 @@
}
}
},
+ data() {
+ return {
+ user: {}
+ }
+ },
+ created() {
+ this.getUser();
+ },
methods: {
+ getUser() {
+ getUserProfile().then(response => {
+ this.user = response.data.user;
+ });
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
--
Gitblit v1.9.1