From 5a1616f169d75ece07d2d12a8edac3e5f660a920 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 09:36:16 +0800
Subject: [PATCH] 合并
---
src/layout/navBars/breadcrumb/user.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 4b78003..5a26dde 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -2,7 +2,7 @@
<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
<div class="logo">
<img src="../../../assets/menu/companyLogo.png" />
- <span style="font-size: 22px; color: #409eff; font-weight: bolder; border-left: 2px solid #409eff; padding-left: 10px">{{ systemName }}</span>
+ <span style="font-size: 32px; color: #409eff; font-weight: bolder; border-left: 2px solid #409eff; padding-left: 10px">{{ systemName }}</span>
</div>
<div style="display: flex; align-items: center; padding-right: 5px">
<div @click="backToMenu()" class="backBtn">返回首页</div>
@@ -57,7 +57,7 @@
</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" />
+ <img src="../../../assets/avator.png" class="layout-navbars-breadcrumb-user-link-photo mr5" style="width: 24px;height: 24px"/>
{{ userInfos.userName }}
<el-icon class="el-icon--right">
<ele-ArrowDown />
@@ -65,7 +65,7 @@
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="/homeMenu">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
+ <el-dropdown-item command="/newMenu">{{ $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>-->
@@ -100,6 +100,7 @@
import { NextLoading } from '/@/utils/loading';
import { useRequestOldRoutes } from '/@/stores/requestOldRoutes';
import { dynamicRoutes } from '/@/router/route';
+import Cookies from 'js-cookie';
export default defineComponent({
name: 'layoutBreadcrumbUser',
@@ -250,8 +251,8 @@
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 (!Cookies.get('token')) return false;
+ const res = await menuApi.getMenuAdmin(Cookies.get('projectId') === null ? '' : Cookies.get('projectId'));
if (res.data.code === '200') {
state.systemName = res.data.data[1].project.projectName;
console.log(state.systemName);
@@ -260,7 +261,7 @@
}
};
const backToMenu = () => {
- router.push({ path: 'homeMenu' });
+ router.push({ path: 'newMenu' });
};
// 页面加载时
onMounted(() => {
@@ -294,7 +295,7 @@
justify-content: space-between;
.logo {
- height: 50px;
+ height: 75%;
padding: 5px 10px;
display: flex;
align-items: center;
@@ -319,8 +320,8 @@
padding: 0 10px;
cursor: pointer;
color: var(--next-bg-topBarColor);
- height: 50px;
- line-height: 50px;
+ height: 80px;
+ line-height: 80px;
display: flex;
align-items: center;
&:hover {
--
Gitblit v1.9.2