From 3c0b2d339126e2cb57cb25616a7bc3c9e52c11df Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 27 五月 2023 10:10:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/homeRoot/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index d071d3f..39e719e 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -43,7 +43,7 @@
@click="getPersonInfo(rootSecList[1][0].userId)"></img>
</el-avatar>
<el-avatar shape="circle" class="avater_2_4" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][1].url"
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][1].url"
@click="getPersonInfo(rootSecList[1][1].userId)"></img>
</el-avatar>
<el-avatar shape="circle" class="avater_2_5" v-if="isShow_2">
@@ -63,8 +63,8 @@
@click="getPersonInfo(rootSecList[3][1].userId)"></img>
</el-avatar>
<el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
+ @click="getPersonInfo(rootSecList[0][0].userId)"></img>
</el-avatar>
<el-avatar shape="circle" class="avater_3_2" v-if="isShow_3">
<el-img :src="'http://47.93.189.255:8080'+ rootList.url"
@@ -255,6 +255,7 @@
url:undefined,
familyId:undefined,
secondFamilyId: undefined,
+ identity:undefined,
childList:[{
userId: undefined,
nickName: undefined,
@@ -282,6 +283,7 @@
url:undefined,
familyId:undefined,
secondFamilyId: undefined,
+ identity:undefined,
childList:undefined
}]
}]
@@ -439,8 +441,8 @@
}
.avater_1_1 {
position: absolute;
- top: 94%;
- left: 49%;
+ top: 95%;
+ left: 51%;
transform: translate(-50%, -50%);
width: 54px;
height: 54px;
@@ -449,7 +451,7 @@
}
.avater_1_2{
position: absolute;
- top: 84%;
+ top: 85%;
left: 48%;
transform: translate(-50%, -50%);
width: 45px;
--
Gitblit v1.9.1