From b37d9a1f4f39fb04f48a63d11d759c673e5f4d6a Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 11 八月 2022 19:15:15 +0800
Subject: [PATCH] lct
---
/dev/null | 0
src/layout/navBars/breadcrumb/user.vue | 173 +++++++++++++++++++++++++++++++--------------------------
src/assets/menu/companyLogo.png | 0
src/assets/loginPage/map-bg.jpg | 0
4 files changed, 93 insertions(+), 80 deletions(-)
diff --git a/src/assets/loginPage/map-bg.jpg b/src/assets/loginPage/map-bg.jpg
index a377e7c..d8d3715 100644
--- a/src/assets/loginPage/map-bg.jpg
+++ b/src/assets/loginPage/map-bg.jpg
Binary files differ
diff --git a/src/assets/menu/companyLogo.jpg b/src/assets/menu/companyLogo.jpg
deleted file mode 100644
index 2ab18b0..0000000
--- a/src/assets/menu/companyLogo.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/menu/companyLogo.png b/src/assets/menu/companyLogo.png
index 7150a8d..0f9f2d1 100644
--- a/src/assets/menu/companyLogo.png
+++ b/src/assets/menu/companyLogo.png
Binary files differ
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 7601048..79db556 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -4,76 +4,77 @@
<img src="../../../assets/menu/companyLogo.jpg" />
<span style="font-size: 16px; color: #333; font-weight: bolder"> | {{ systemName }}</span>
</div>
- <div style="display: flex; padding-right: 5px">
- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
- <div class="layout-navbars-breadcrumb-user-icon">
- <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
- </div>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
- <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
- <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- <!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
- <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
- <!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
- <!-- </div>-->
- <!-- <template #dropdown>-->
- <!-- <el-dropdown-menu>-->
- <!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
- <!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
- <!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
- <!-- </el-dropdown-menu>-->
- <!-- </template>-->
- <!-- </el-dropdown>-->
- <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
- <!-- <el-icon :title="$t('message.user.title2')">-->
- <!-- <ele-Search />-->
- <!-- </el-icon>-->
- <!-- </div>-->
- <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
- <!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
- <!-- </div>-->
- <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
- <!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
- <!-- <template #reference>-->
- <!-- <el-badge :is-dot="true">-->
- <!-- <el-icon :title="$t('message.user.title4')">-->
- <!-- <ele-Bell />-->
- <!-- </el-icon>-->
- <!-- </el-badge>-->
- <!-- </template>-->
- <!-- <template #default>-->
- <!-- <UserNews />-->
- <!-- </template>-->
- <!-- </el-popover>-->
- <!-- </div>-->
- <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
- <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
+ <div style="display: flex;align-items:center;padding-right: 5px">
+ <div @click="backToMenu()" class="backBtn">返回首页</div>
+ <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
+ <div class="layout-navbars-breadcrumb-user-icon">
+ <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
</div>
- <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
- <span class="layout-navbars-breadcrumb-user-link">
- <img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
- {{ userInfos.userName }}
- <el-icon class="el-icon--right">
- <ele-ArrowDown />
- </el-icon>
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
- <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
- <!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
- <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
- <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
- <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- <Search ref="searchRef" />
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="large" :disabled="disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>
+ <el-dropdown-item command="default" :disabled="disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>
+ <el-dropdown-item command="small" :disabled="disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">-->
+<!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+<!-- <i class="iconfont" :class="disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'" :title="$t('message.user.title1')"></i>-->
+<!-- </div>-->
+<!-- <template #dropdown>-->
+<!-- <el-dropdown-menu>-->
+<!-- <el-dropdown-item command="zh-cn" :disabled="disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>-->
+<!-- <el-dropdown-item command="en" :disabled="disabledI18n === 'en'">English</el-dropdown-item>-->
+<!-- <el-dropdown-item command="zh-tw" :disabled="disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </template>-->
+<!-- </el-dropdown>-->
+<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
+<!-- <el-icon :title="$t('message.user.title2')">-->
+<!-- <ele-Search />-->
+<!-- </el-icon>-->
+<!-- </div>-->
+ <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">-->
+ <!-- <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>-->
+ <!-- </div>-->
+ <!-- <div class="layout-navbars-breadcrumb-user-icon">-->
+ <!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
+ <!-- <template #reference>-->
+ <!-- <el-badge :is-dot="true">-->
+ <!-- <el-icon :title="$t('message.user.title4')">-->
+ <!-- <ele-Bell />-->
+ <!-- </el-icon>-->
+ <!-- </el-badge>-->
+ <!-- </template>-->
+ <!-- <template #default>-->
+ <!-- <UserNews />-->
+ <!-- </template>-->
+ <!-- </el-popover>-->
+ <!-- </div>-->
+ <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
+ <i class="iconfont" :title="isScreenfull ? $t('message.user.title6') : $t('message.user.title5')" :class="!isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"></i>
+ </div>
+ <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
+ <span class="layout-navbars-breadcrumb-user-link">
+ <img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+ {{ userInfos.userName }}
+ <el-icon class="el-icon--right">
+ <ele-ArrowDown />
+ </el-icon>
+ </span>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+ <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
+<!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
+ <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ <Search ref="searchRef" />
</div>
</div>
</template>
@@ -92,9 +93,7 @@
import UserNews from '/@/layout/navBars/breadcrumb/userNews.vue';
import Search from '/@/layout/navBars/breadcrumb/search.vue';
import { useLoginApi } from '/@/api/login';
-import { Session } from '/@/utils/storage';
import { useMenuApi } from '/@/api/systemManage/menu/index';
-import { ElMessage } from 'element-plus';
const menuApi = useMenuApi();
import { backEndComponent, getBackEndControlRoutes, initBackEndControlRoutes, setAddRoute, setFilterMenuAndCacheTagsViewRoutes } from '../../../router/backEnd';
@@ -249,27 +248,31 @@
}
};
- const getSysName = async () => {
+ const getSysName = async()=>{
if (window.nextLoading === undefined) NextLoading.start();
if (!Session.get('token')) return false;
const res = await menuApi.getMenuAdmin(Session.get('projectId') === null ? '' : Session.get('projectId'));
- if (res.data.code === '200') {
+ if(res.data.code === '200'){
state.systemName = res.data.data[1].project.projectName;
- console.log(state.systemName);
- } else {
- console.log('有问题');
+ console.log(state.systemName)
+ }else{
+ console.log('有问题')
}
- };
+ }
+ const backToMenu=()=>{
+ router.push({ path: 'homeMenu' })
+ }
// 页面加载时
onMounted(() => {
if (Local.get('themeConfig')) {
initI18n();
initComponentSize();
}
- getSysName();
+ getSysName()
});
return {
userInfos,
+ backToMenu,
onLayoutSetingClick,
onHandleCommandClick,
onScreenfullClick,
@@ -290,14 +293,14 @@
align-items: center;
justify-content: space-between;
- .logo {
+ .logo{
height: 50px;
padding: 5px 10px;
display: flex;
align-items: center;
overflow: hidden;
box-sizing: border-box;
- img {
+ img{
height: 100%;
}
}
@@ -340,5 +343,15 @@
::v-deep(.el-badge__content.is-fixed) {
top: 12px;
}
+ .backBtn{
+ font-size: 16px;
+ cursor: pointer;
+ margin-right: 20px;
+
+ &:hover{
+ color: #409eff;
+ font-weight: bolder;
+ }
+ }
}
</style>
--
Gitblit v1.9.2