From faa5542bc83deb9d1a6f13ff52aca4669a89a919 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 14 八月 2024 16:38:00 +0800
Subject: [PATCH] 钢化进炉中，宽高调换，可视化大屏表格新增详情按钮，更改其中一个钢化灯显示判断
---
UI-Project/src/layout/MainErpView.vue | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index 85cd1aa..ba2c234 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);
@@ -23,20 +23,17 @@
let token = userInfo; // 鎻愬彇 token
// 閫�鍑虹櫥褰曟柟娉�
function quit() {
- // removeToken()
+ // localStorage.removeItem('token');
+ store.$patch({
+ user: null,
+ })
router.push('/login')
}
// const quit = async () => {
// try {
-
-// const response = await request.get('/loadGlass/sys/user/logout', {
-// token: token,
-// user: null,
-// })
+// store.$patch({user: null})
+// const response = await request.post('/loadGlass/sys/user/logout')
// if (response.code === 200) {
-// // 鐧诲嚭鎴愬姛锛屾竻闄ゆ湰鍦板瓨鍌ㄧ殑 userInfo
-// localStorage.removeItem('userInfo');
-// // 鍙互鍦ㄨ繖閲岄噸缃簲鐢ㄧ姸鎬侊紝濡傚鑸埌鐧诲綍椤电瓑
// console.log('鐧诲嚭鎴愬姛');
// } else {
// // 澶勭悊閿欒鎯呭喌
@@ -161,6 +158,9 @@
openFlag = menuID
}
}
+function toggleCollapse() {
+ isCollapse.value = !isCollapse.value;
+}
</script>
<template>
@@ -171,7 +171,11 @@
<img src="../assets/northGlass.ico"
alt=""
style="max-width: 100%;max-height: 100%">
- <h3 style="margin: 1rem ;font-weight: bold;width: 33vw;"> {{ $t('main.titleFirst') }}{{ user }}{{ $t('main.titleLast') }}</h3>
+ <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"
@@ -187,33 +191,21 @@
<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> -->
</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 }}
@@ -231,12 +223,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>
--
Gitblit v1.8.0