From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UI-Project/src/layout/MainErpView.vue | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue index ba2c234..e2f4b57 100644 --- a/UI-Project/src/layout/MainErpView.vue +++ b/UI-Project/src/layout/MainErpView.vue @@ -172,10 +172,6 @@ alt="" style="max-width: 100%;max-height: 100%"> <h3 style="margin: 1rem ;font-weight: bold;width: 33vw;"> {{ $t('main.titleFirst') }}{{ userName }}{{ $t('main.titleLast') }}</h3> - <!-- <div class="header-left"> - <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse" - style="height:30px;"></el-button> - </div> --> <span style="height: 70%;width: 78vw;margin-top: 1rem;"> <!-- <el-button class="sys-quit" @click="quit" @@ -191,16 +187,17 @@ <SwitchButton size=""/>{{ $t('main.quit') }} </el-icon> </el-button> - <!-- <div class="header-left"> - <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse" - style="height:30px;"></el-button> - </div> --> + <div class="header-left"> + <el-button @click="toggleCollapse" style="height: 30px;"> + <el-icon><Expand /></el-icon> + </el-button> + </div> </span> </div> </el-header> <div id="line"></div> <el-container> - <el-aside :width="isCollapse ? '30px' : '200px'" style="background-color: #fff;"> + <el-aside :width="isCollapse ? '0px' : '200px'" style="background-color: #fff;"> <el-row :span="20"> <el-menu :default-active="activePath" class="el-menu-vertical-demo" > <div class="menu"> @@ -339,7 +336,7 @@ ul li { height: 28px; - width: 200px; + width: 180px; line-height: 30px; /* background: rgb(128, 128, 128); */ color: #000000; @@ -454,4 +451,7 @@ transform: translateX(0); } } +.header-left{ + margin-left: -350px; +} </style> \ No newline at end of file -- Gitblit v1.8.0