From de46cb80b7c4d1fb74a4b72d8fc4406e7e3144e7 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 19 八月 2024 08:49:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/layout/MainErpView.vue | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index 88c07a1..8fdf761 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -10,11 +10,11 @@
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const store = userInfo()
-
+const isCollapse = ref(false);
// const { $i18n } = useI18n(); // 鑾峰彇 i18n 瀹炰緥
const router = useRouter()
const userStore = useUserInfoStore()
-const user = userStore.user.userName
+// const user = userStore.user.userName
let userInfoStr = window.localStorage.getItem('userInfo')
console.log(userInfoStr);
@@ -158,6 +158,9 @@
openFlag = menuID
}
}
+function toggleCollapse() {
+ isCollapse.value = !isCollapse.value;
+}
</script>
<template>
@@ -169,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"
@@ -188,33 +187,23 @@
<SwitchButton size=""/>{{ $t('main.quit') }}
</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> -->
+ </div>
</span>
</div>
</el-header>
<div id="line"></div>
<el-container>
- <!-- <el-aside width="160px"
- style="height: 99%; background-color: #fff;">
- <div class="menu">
- <div v-for="items in menuList">
- <div class='menu_title'
- @click="openMenu(items.id)">
- <span>鈽�</span>
- {{ items.menuName }}
- </div>
- <ul class='enter-x-left'
- v-show="openFlag==items.id">
- <li v-for="menuItem in items.children"
- style="margin-bottom:2px">
- <router-link :to="{path:menuItem.url}">
- {{ menuItem.menuName }}
- </router-link>
- </el-aside> -->
+ <el-aside :width="isCollapse ? '30px' : '200px'" style="background-color: #fff;">
<el-row :span="20">
- <el-menu :default-active="activePath" class="el-menu-vertical-demo" background-color="#fff">
+ <el-menu :default-active="activePath" class="el-menu-vertical-demo" >
<div class="menu">
<div v-for="items in menuList">
- <div class='menu_title'
+ <div class='menu_title' v-show="!isCollapse"
@click="openMenu(items.id)">
<span>鈽�</span>
{{ items.menuName }}
@@ -232,12 +221,12 @@
</div>
</el-menu>
</el-row>
- <el-main>
+</el-aside>
+<el-main>
<div id="main">
<router-view></router-view>
</div>
</el-main>
-
</el-container>
</el-container>
</div>
@@ -463,4 +452,7 @@
transform: translateX(0);
}
}
+.header-left{
+ margin-left: -350px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0