From 7cf8c1c27ded519cde2e0c3b0099a6a00dabcd9c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 04 十一月 2022 14:56:49 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/layout/components/Header/index.vue | 48 ++++++++++++++----------
src/views/layout/components/Main/index.vue | 33 ++++++++--------
src/views/layout/components/Menu/index.vue | 1
3 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 840e9af..b193bcb 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,13 @@
},
],
keyword: '',
+ info:null,
+ show:false
};
},
created() {
- this.getLoginInfo();
+ this.setLoginInfo()
+ console.log(this.user)
},
methods: {
baseInfo() {
@@ -171,7 +174,7 @@
})
.then(res => {
sessionStorage.setItem('user', JSON.stringify(res.data));
- this.user = res.data.user;
+ this.info = res.data.user;
})
},
handleClose(done) {
@@ -210,22 +213,27 @@
}
})
},
- // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- getLoginInfo() {
+ // 璁剧疆鐢ㄦ埛鍩烘湰淇℃伅
+ async setLoginInfo() {
const info = JSON.parse(sessionStorage.getItem('user'));
if (info) {
+ console.log(info)
this.user = info;
} else {
+ this.user = await this.getLoginInfo();
+ console.log(this.user)
+ }
+ 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
}
}
};
diff --git a/src/views/layout/components/Main/index.vue b/src/views/layout/components/Main/index.vue
index 268880c..2d173a7 100644
--- a/src/views/layout/components/Main/index.vue
+++ b/src/views/layout/components/Main/index.vue
@@ -87,84 +87,84 @@
link:'/operate/management/myIndex',
},
{
- id:12,
+ id:13,
label:'鎴戠殑寰呭姙',
link:'/operate/myWait',
},
{
- id:12,
+ id:14,
label:'妗堝嵎鏌ヨ',
link:'/operate/viewEvent',
},
{
- id:12,
+ id:15,
label:'杞﹁締绠＄悊',
link:'/operate/car/carIndex',
},
{
- id:12,
+ id:16,
label:'鍥剧墖绠＄悊',
link:'/operate/images',
},
{
- id:12,
+ id:17,
label:'瑙嗛绠＄悊',
link:'/operate/videoControl',
},
{
- id:12,
+ id:18,
label:'娑堟伅绠＄悊',
link:'/operate/message/messageIndex',
},
{
- id:12,
+ id:19,
label:'鐭俊绠＄悊',
link:'/operate/sms/smsIndex',
},
{
- id:12,
+ id:20,
label:'鏃ュ織绠＄悊',
link:'/operate/log',
},
]
},
{
- id:1,
+ id:21,
title:'瑙嗛宸℃煡',
children:[
{
- id:2,
+ id:22,
label:'瑙嗛宸℃煡',
link:'/video',
},
]
},
{
- id:1,
+ id:23,
title:'鏅鸿兘宸℃煡',
children:[
{
- id:2,
+ id:24,
label:'棰勮鐮斿垽',
link:'/studyJudge',
},
{
- id:3,
+ id:25,
label:'杩濊妫�绱�',
link:'/illegalSearch',
},
{
- id:4,
+ id:26,
label:'瓒嬪娍鍒嗘瀽',
link:'/trendAnalysis',
},
{
- id:5,
+ id:27,
label:'杩濈珷缁熻',
link:'/trendAnalysis',
},
{
- id:6,
+ id:28,
label:'杩濇硶缁熻',
link:'/typeStatistics',
},
@@ -181,7 +181,6 @@
methods:{
handleJump(url){
const baseURL = '/home'
- console.log(url)
// 璺敱璺宠浆
this.$router.push({path:baseURL+url})
}
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index f525f42..df0d374 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -42,7 +42,6 @@
<el-menu-item
v-else
- :key="secondMenu.id"
:index="`${secondMenu.id}`"
:route="{ name: secondMenu.url }"
>{{ secondMenu.title }}</el-menu-item
--
Gitblit v1.8.0