From 0e11714f01de9fe1756d6896f67bcd07ff50a148 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 10 八月 2022 18:34:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/layout/navBars/breadcrumb/user.vue | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 415e04e..bad2b59 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -1,5 +1,10 @@
<template>
<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+ <div class="logo">
+ <img src="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>
@@ -12,23 +17,23 @@
</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>
+<!-- <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>-->
@@ -61,7 +66,7 @@
<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="/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>
@@ -69,6 +74,7 @@
</template>
</el-dropdown>
<Search ref="searchRef" />
+ </div>
</div>
</template>
@@ -86,6 +92,20 @@
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';
+import {NextLoading} from "/@/utils/loading";
+import {useRequestOldRoutes} from "/@/stores/requestOldRoutes";
+import {dynamicRoutes} from "/@/router/route";
export default defineComponent({
name: 'layoutBreadcrumbUser',
@@ -102,7 +122,8 @@
const state = reactive({
isScreenfull: false,
disabledI18n: 'zh-cn',
- disabledSize: 'large'
+ disabledSize: 'large',
+ systemName: ''
});
// 设置分割样式
const layoutUserFlexNum = computed(() => {
@@ -232,12 +253,25 @@
break;
}
};
+
+ 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'){
+ state.systemName = res.data.data[1].project.projectName;
+ console.log(state.systemName)
+ }else{
+ console.log('有问题')
+ }
+ }
// 页面加载时
onMounted(() => {
if (Local.get('themeConfig')) {
initI18n();
initComponentSize();
}
+ getSysName()
});
return {
userInfos,
@@ -259,7 +293,19 @@
.layout-navbars-breadcrumb-user {
display: flex;
align-items: center;
- justify-content: flex-end;
+ justify-content: space-between;
+
+ .logo{
+ height: 50px;
+ padding: 5px 10px;
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ box-sizing: border-box;
+ img{
+ height: 100%;
+ }
+ }
&-link {
height: 100%;
display: flex;
--
Gitblit v1.9.2