From c7ff3b73e5a42e6adc923c72b118b3134daf58ed Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期四, 29 八月 2024 09:34:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/components/navbar/index.vue | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/components/navbar/index.vue b/src/components/navbar/index.vue
index e37b697..f817edc 100644
--- a/src/components/navbar/index.vue
+++ b/src/components/navbar/index.vue
@@ -2,15 +2,12 @@
<div class="navbar">
<div class="left-side">
<a-space>
- <img
- alt="logo"
- src="//p3-armor.byteimg.com/tos-cn-i-49unhts6dw/dfdba5317c0c20ce20e64fac803d52bc.svg~tplv-49unhts6dw-image.image"
- />
+ <img class="logo" alt="logo" src="@/assets/images/icon-logo1.png" />
<a-typography-title
:style="{ margin: 0, fontSize: '18px' }"
:heading="5"
>
- Arco Pro
+ SmartAl澶фā鍨嬪钩鍙�
</a-typography-title>
<icon-menu-fold
v-if="!topMenu && appStore.device === 'mobile'"
@@ -82,7 +79,7 @@
</a-button>
</a-tooltip>
</li>
- <li>
+ <!-- <li>
<a-tooltip :content="$t('settings.navbar.alerts')">
<div class="message-box-trigger">
<a-badge :count="9" dot>
@@ -108,7 +105,7 @@
<message-box />
</template>
</a-popover>
- </li>
+ </li> -->
<li>
<a-tooltip
:content="
@@ -146,14 +143,14 @@
</li>
<li>
<a-dropdown trigger="click">
- <a-avatar
+ <!-- <a-avatar
:size="32"
:style="{ marginRight: '8px', cursor: 'pointer' }"
>
<img alt="avatar" :src="avatar" />
- </a-avatar>
+ </a-avatar> -->
<template #content>
- <a-doption>
+ <!-- <a-doption>
<a-space @click="switchRoles">
<icon-tag />
<span>
@@ -176,7 +173,22 @@
{{ $t('messageBox.userSettings') }}
</span>
</a-space>
+ </a-doption> -->
+ <a-doption>
+ <a-space @click="handleLogout">
+ <icon-export />
+ <span>
+ {{ $t('messageBox.logout') }}
+ </span>
+ </a-space>
</a-doption>
+ </template>
+ </a-dropdown>
+ </li>
+ <li style="padding: 0">
+ <a-dropdown trigger="click">
+ <div> {{ name }}</div>
+ <template #content>
<a-doption>
<a-space @click="handleLogout">
<icon-export />
@@ -202,6 +214,8 @@
import useUser from '@/hooks/user';
import Menu from '@/components/menu/index.vue';
import MessageBox from '../message-box/index.vue';
+ import login from '@/assets/images/icon-logo1.png';
+ import { getUserInfo } from '@/utils/auth';
const appStore = useAppStore();
const userStore = useUserStore();
@@ -209,9 +223,11 @@
const { changeLocale, currentLocale } = useLocale();
const { isFullscreen, toggle: toggleFullScreen } = useFullscreen();
const locales = [...LOCALE_OPTIONS];
- const avatar = computed(() => {
- return userStore.avatar;
- });
+ const avatar = login;
+ const name = JSON.parse(getUserInfo()).name || '';
+ //const avatar = computed(() => {
+ // return userStore.avatar;
+ //});
const theme = computed(() => {
return appStore.theme;
});
@@ -275,6 +291,10 @@
display: flex;
align-items: center;
padding-left: 20px;
+ .logo {
+ width: 32px;
+ height: 32px;
+ }
}
.center-side {
--
Gitblit v1.8.0