From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/layout/MainErpView.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index 8fdf761..e2f4b57 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -188,17 +188,16 @@
</el-icon>
</el-button>
<div class="header-left">
- <el-button @click="toggleCollapse"
- style="height:30px;">鈽�</el-button>
- <!-- <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse"
- style="height:30px;"></el-button> -->
+ <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">
@@ -337,7 +336,7 @@
ul li {
height: 28px;
- width: 200px;
+ width: 180px;
line-height: 30px;
/* background: rgb(128, 128, 128); */
color: #000000;
--
Gitblit v1.8.0