From 85d35dcc5899e54128e63a11ad8da2fec6e9394f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 26 八月 2023 15:43:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/layout/components/Navbar.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9f1ae3e..dd146bb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -13,7 +13,7 @@
</div>
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
- <a class="user-avatar">{{ '涓ぉ'.slice(0,1) }}</a>
+ <a class="user-avatar">{{ user.name.slice(0,1) }}</a>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-item >
@@ -24,7 +24,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" :append-to-body="true">
+ <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" :append-to-body="true" width="40%">
<el-form :model="form">
<el-form-item label="鏃у瘑鐮�" :label-width="formLabelWidth">
<el-input v-model="form.oldPwd" autocomplete="off"></el-input>
@@ -49,6 +49,12 @@
import { mapGetters } from 'vuex'
// import Breadcrumb from '@/components/Breadcrumb'
// import Hamburger from '@/components/Hamburger'
+ import {
+ get,
+ post,
+ wpost,
+ postFile
+ } from "@/api/util/requestUtil.js"
export default {
data(){
@@ -59,7 +65,11 @@
confirmPwd: ''
},
dialogFormVisible: false,
- formLabelWidth: '120px'
+ formLabelWidth: '120px',
+ user: {
+ id: null,
+ name: 'value'
+ }
}
},
components: {
@@ -72,6 +82,9 @@
'avatar'
])
},
+ mounted() {
+ this.getUser()
+ },
methods: {
reset(){
this.dialogFormVisible = false;
@@ -91,7 +104,12 @@
async logout() {
// await this.$store.dispatch('user/logout')
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
- }
+ },
+ getUser(){
+ get(this.$url.info).then(res=>{
+ this.user = res.data
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3