From ea2b0825e761a55b17e7bfa044e8267de09c27a9 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期二, 13 九月 2022 14:44:13 +0800 Subject: [PATCH] Default Changelist --- src/layout/navBars/breadcrumb/user.vue | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 4b78003..993fbd9 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -1,8 +1,8 @@ <template> <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> + <img @click="toHome" src="../../../assets/menu/companyLogo.png" /> + <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,8 @@ import { NextLoading } from '/@/utils/loading'; import { useRequestOldRoutes } from '/@/stores/requestOldRoutes'; import { dynamicRoutes } from '/@/router/route'; +import Cookies from 'js-cookie'; +import {useRoutesList} from "/@/stores/routesList"; export default defineComponent({ name: 'layoutBreadcrumbUser', @@ -109,6 +111,7 @@ const { proxy } = <any>getCurrentInstance(); const router = useRouter(); const stores = useUserInfo(); + const routeList = storeToRefs(useRoutesList()) const storesThemeConfig = useThemeConfig(); const { userInfos } = storeToRefs(stores); const { themeConfig } = storeToRefs(storesThemeConfig); @@ -250,8 +253,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 +263,13 @@ } }; const backToMenu = () => { - router.push({ path: 'homeMenu' }); + router.push({ path: 'newMenu' }).then(()=>{ + routeList.routesList.value = [] + console.log(routeList); + }); + }; + const toHome = () => { + router.push({ path: 'newMenu' }); }; // 页面加载时 onMounted(() => { @@ -273,6 +282,7 @@ return { userInfos, backToMenu, + toHome, onLayoutSetingClick, onHandleCommandClick, onScreenfullClick, @@ -294,7 +304,7 @@ justify-content: space-between; .logo { - height: 50px; + height: 75%; padding: 5px 10px; display: flex; align-items: center; @@ -302,6 +312,7 @@ box-sizing: border-box; img { height: 100%; + cursor: pointer; } } &-link { @@ -319,8 +330,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