From 61cfd79f90f7463ba1f9149d8d988bb081f6a3a1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 12:30:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/system/user/profile/index.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 1d0d92b..1c2ab57 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -8,8 +8,14 @@
</div>
<div>
<div class="text-center">
- <userAvatar :user="user" />
- </div >
+ <el-avatar shape="square" style="width: 200px;;height: 200px;" >
+ <el-image
+ :src="'https://www.bendudu.com:8080/'+ user.url"
+ :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+
+
+ </el-avatar> </div >
<ul class="list-group list-group-striped">
<li class="list-group-item">
鐢ㄦ埛鍚嶇О
@@ -45,9 +51,9 @@
<span>鍩烘湰璧勬枡</span>
</div>
<el-tabs v-model="activeTab" >
- <el-tab-pane label="鍩烘湰璧勬枡" name="userinfo">
+ <!-- <el-tab-pane label="鍩烘湰璧勬枡" name="userinfo">
<userInfo :user="user" />
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="淇敼瀵嗙爜" name="resetPwd">
<resetPwd />
</el-tab-pane>
@@ -260,7 +266,7 @@
user: {},
roleGroup: {},
postGroup: {},
- activeTab: "userinfo",
+ activeTab: "resetPwd",
activeTab1:"瀹舵牴缃�"
};
},
@@ -401,6 +407,7 @@
// });
getIndividualList().then(response => {
this.user = response.data;
+ // console.log(this.user,'useruseruser')
// alert(890)
this.fid = response.data.familyId
// alert(this.fid)
@@ -423,8 +430,9 @@
getList() {
let _this = this
+ let clanId = this.$store.state.user.clanId
- getAllInfo().then(response=>{
+ getAllInfo(clanId).then(response=>{
let fams = response.data
for(let i = 0; i < fams.length; i++)
_this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })
--
Gitblit v1.9.1