From cc9ddf2ecaf3ad935374f49c842227f7eb15779d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/layout/components/Header/index.vue | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 840e9af..cc861e6 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -1,6 +1,6 @@
<template>
<!-- 澶撮儴 -->
- <el-header>
+ <el-header v-if="show">
<!-- 宸︿晶鑿滃崟 -->
<div class="header-left">
<div class="menu-left__item" v-for="(item, index) in menuLeftList" :key="item.id" @click="changeActive(index)">
@@ -15,10 +15,10 @@
</div>
<!-- 鐧诲綍鐢ㄦ埛 -->
<div class="menu-right__item user" @mousemove="flag.user = true" @mouseleave="flag.user = false">
- <el-avatar :size="20" :src="user.icon" v-if="user.icon"></el-avatar>
+ <el-avatar :size="20" :src="user.user.icon" v-if="user.user.icon"></el-avatar>
<el-avatar :size="20" src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png" v-else>
</el-avatar>
- <span style="padding: 0 5px;">{{ user.username}}</span>
+ <span style="padding: 0 5px;">{{ user.user.username}}</span>
<i class="el-icon-arrow-down"></i>
<!-- 鐢ㄦ埛鎿嶄綔 -->
<div class="user-card" v-if="flag.user" @mouseleave="flag.user = false">
@@ -69,27 +69,27 @@
</el-dialog>
<el-dialog :visible.sync="baseInformationVisible" width="35%" title="鍩烘湰淇℃伅" v-if="baseInformationVisible"
:before-close="handleClose">
- <el-form :model="user" class="info" label-width="6vw">
+ <el-form :model="info" class="info" label-width="6vw">
<el-form-item label="鐢ㄦ埛ID" min-width="6">
- <el-input v-model="user.id"></el-input>
+ <el-input v-model="info.id"></el-input>
</el-form-item>
<el-form-item prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="10">
- <el-input v-model="user.nickName"></el-input>
+ <el-input v-model="info.nickName"></el-input>
</el-form-item>
<el-form-item prop="nickName" label="鎵�灞炲鍚�" min-width="8">
- <el-input v-model="user.username"></el-input>
+ <el-input v-model="info.username"></el-input>
</el-form-item>
<el-form-item prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
- <el-input v-model="user.mobile"></el-input>
+ <el-input v-model="info.mobile"></el-input>
</el-form-item>
<!-- <el-form-item prop="departName" label="鎵�灞為儴闂�" min-width="8">
<el-input v-model="user.mobile"></el-input>
</el-form-item> -->
<el-form-item prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
- <el-input v-model="user.jobTitle"></el-input>
+ <el-input v-model="info.jobTitle"></el-input>
</el-form-item>
<el-form-item prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
- <el-input v-model="user.createTime"></el-input>
+ <el-input v-model="info.createTime"></el-input>
</el-form-item>
</el-form>
@@ -156,10 +156,12 @@
},
],
keyword: '',
+ info:null,
+ show:false
};
},
created() {
- this.getLoginInfo();
+ this.setLoginInfo()
},
methods: {
baseInfo() {
@@ -171,7 +173,7 @@
})
.then(res => {
sessionStorage.setItem('user', JSON.stringify(res.data));
- this.user = res.data.user;
+ this.info = res.data.user;
})
},
handleClose(done) {
@@ -197,7 +199,6 @@
sessionStorage.clear();
this.$router.push({ path: "/login" })
}).catch(err => {
- console.log(err);
})
},
// 鏀瑰彉閫変腑鐘舵��
@@ -210,22 +211,25 @@
}
})
},
- // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- getLoginInfo() {
+ // 璁剧疆鐢ㄦ埛鍩烘湰淇℃伅
+ async setLoginInfo() {
const info = JSON.parse(sessionStorage.getItem('user'));
if (info) {
this.user = info;
} else {
+ this.user = await this.getLoginInfo();
+ }
+ this.show = true
+ },
+ // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ async getLoginInfo(){
const name = sessionStorage.getItem('name');
- this.$axios({
+ let res = await this.$axios({
method: 'get',
url: 'sccg/admin/info?name=' + name,
})
- .then(res => {
- sessionStorage.setItem('user', JSON.stringify(res.data));
- this.user = res.data.user;
- })
- }
+ sessionStorage.setItem('user', JSON.stringify(res.data));
+ return res.data
}
}
};
@@ -252,7 +256,7 @@
.header-left {
display: flex;
-
+ flex: 1;
.menu-left__item {
width: 120px;
@@ -277,9 +281,10 @@
.header-right {
display: flex;
-
+ padding-left: 10vw;
+ flex: 1;
.item {
- width: 60px;
+ width: 100%;
position: relative;
:deep(.is-fixed) {
@@ -294,12 +299,12 @@
}
.search {
- width: 200px;
+ flex: 3;
}
.user {
margin-left: 20px;
- width: 120px;
+ flex: 2;
display: flex;
align-items: center;
justify-content: center;
@@ -334,7 +339,7 @@
}
.btn {
- width: 60px;
+ flex: 1;
font-size: 20px;
position: relative;
--
Gitblit v1.8.0