fix:联调登录接口

This commit is contained in:
unknown
2025-12-31 18:57:06 +08:00
parent bd2a300f55
commit f22b0dfcbc
27 changed files with 1514 additions and 226 deletions

View File

@@ -4,7 +4,9 @@
<el-aside :width="width">
<div class="mj-aside-content">
<!-- 顶部company公司标记 -->
<div class="mj-aside-company"></div>
<div class="mj-aside-logo">
<img :src="companyLogo" class="mj-company-logo" />
</div>
<div class="mj-aside-menu">
<div class="mj-aside-title" v-show="!isCollapse">
{{ topTitle }}
@@ -25,12 +27,15 @@
</el-aside>
<el-container>
<el-header class="mj-header-content">
<!-- 左侧的菜单展示 -->
<mjMenus
:menuList="topLevelMenuList"
mode="horizontal"
:active-menu="selectedTopMenu"
@menu-select="handleTopMenuSelect"
/>
<!-- 右侧用户的内容 -->
<rightMenuGroup />
</el-header>
<el-main>
<!-- <card-item :list="[1,2,3,4,5,6]"/> -->
@@ -44,6 +49,8 @@
import mjMenus from "@/components/standardMenu/index.vue";
import { useUserStore } from "@/store";
import { DArrowLeft, DArrowRight } from "@element-plus/icons-vue";
import rightMenuGroup from './rightMenuGroup.vue';
import companyLogo from '@/assets/images/logo.png';
defineOptions({
name: "Layout",
});
@@ -212,10 +219,18 @@ onUnmounted(() => {
flex-direction: column;
border-right: 1px solid var(--mj-border-color);
.mj-aside-company {
.mj-aside-logo {
height: var(--mj-menu-header-height);
line-height: var(--mj-menu-header-height);
border-bottom: 1px solid var(--mj-border-color);
flex-shrink: 0;
.mj-company-logo{
width: 39px;
height: 32px;
display: inline-block;
vertical-align: middle;
margin-left: 20px;
}
}
.mj-aside-menu {
@@ -245,6 +260,14 @@ onUnmounted(() => {
}
}
.mj-header-content{
display: flex;
justify-content: space-between;
.mj-standard-menu{
flex: 1;
}
}
.mj-header-content {
--el-header-padding: 0;
border-bottom: 1px solid var(--mj-border-color);