From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/page/index/top/index.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 70679a8..990496e 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -7,33 +7,31 @@
</div>
</div>
<div class="top-bar__title">
- <top-menu ref="topMenu" v-if="setting.menu"></top-menu>
+<!--<top-menu ref="topMenu" v-if="setting.menu"></top-menu>-->
<top-search class="top-bar__item" v-if="setting.search"></top-search>
</div>
<div class="top-bar__right">
- <div v-if="setting.lock" class="top-bar__item">
- <top-lock></top-lock>
- </div>
- <div class="top-bar__item">
- <top-qna></top-qna>
- </div>
- <div class="top-bar__item" v-if="setting.fullscreen">
- <top-full></top-full>
+ <div class="icon-box">
+ <top-lock v-if="setting.lock"/>
+ <top-qna />
+ <top-full v-if="setting.fullscreen" title="全屏"/>
+ <img class="gateway" @click="jumpMH" src="@/assets/images/mh.png" alt="进入门户" title="进入门户" width="20" height="20">
</div>
<div class="top-user">
- <img class="top-bar__img" :src="userInfo.avatar" />
+ <img class="top-bar__img" :src="userInfo.avatar " alt=""/>
+
<el-dropdown>
<span class="el-dropdown-link">
- {{ userInfo.user_name }}
+ {{ userInfo.real_name }}
<el-icon class="el-icon--right">
<arrow-down />
</el-icon>
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item>
+<!-- <el-dropdown-item>
<router-link to="/">{{ $t('navbar.dashboard') }}</router-link>
- </el-dropdown-item>
+ </el-dropdown-item>-->
<el-dropdown-item>
<router-link to="/info/index">{{ $t('navbar.userinfo') }}</router-link>
</el-dropdown-item>
@@ -104,9 +102,15 @@
type: 'warning',
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- this.$router.push({ path: '/login' })
+ const env = import.meta.env.VITE_APP_ENV
+ const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
+ env === 'development' ? this.$router.push({ path: '/login' }):window.location.replace(`${adminUrl}#/login`)
})
})
+ },
+ jumpMH () {
+ const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
+ window.location.href = `${adminUrl}#/gatewayPage`
},
},
}
@@ -131,6 +135,7 @@
flex: 1;
display: flex;
align-items: center;
+ height: pxToVh(80);
}
.top-bar__right {
@@ -138,6 +143,19 @@
display: flex !important;
align-items: center;
height: 100%;
+
+ .icon-box{
+ display: flex;
+ align-items: center;
+ gap: 0 20px;
+ .gateway{
+ width: 25px;
+ height: 25px;
+ }
+ >*{
+ cursor: pointer;
+ }
+ }
}
.top-bar__item {
@@ -165,4 +183,4 @@
.el-dropdown-link:hover {
color: #409EFF;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3