From f468170d79dee3f8efb75705c7e23a1b53e54e91 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 七月 2025 22:08:02 +0800
Subject: [PATCH] 修改了内容
---
ruoyi-ui/src/views/homeRoot/index.vue | 366 +++++++++++++++++++++++++++-------------------------
1 files changed, 190 insertions(+), 176 deletions(-)
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index c664157..8b6a15f 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -27,156 +27,156 @@
@click="getPersonInfo(rootList[0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_1_2" v-if="isShow_1">
- <img :src="'http://47.93.189.255:8080/'+ rootList[1].url"
- @click="getPersonInfo(rootList[1].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootList[0].spouse.url"
+ @click="getPersonInfo(rootList[0].spouse.userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_1" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
- @click="getPersonInfo(rootSecList[0][0].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[2].url"
+ @click="getPersonInfo(rootSecList[2].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_2" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][1].url"
- @click="getPersonInfo(rootSecList[0][1].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[0].url"
+ @click="getPersonInfo(rootSecList[0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_3" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][0].url"
- @click="getPersonInfo(rootSecList[1][0].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[1].url"
+ @click="getPersonInfo(rootSecList[1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_4" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][1].url"
- @click="getPersonInfo(rootSecList[1][1].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[3].url"
+ @click="getPersonInfo(rootSecList[3].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_5" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][0].url"
- @click="getPersonInfo(rootSecList[2][0].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[2].spouse.url"
+ @click="getPersonInfo(rootSecList[2].spouse.userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_6" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][1].url"
- @click="getPersonInfo(rootSecList[2][1].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[0].spouse.url"
+ @click="getPersonInfo(rootSecList[0].spouse.userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_7" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[3][0].url"
- @click="getPersonInfo(rootSecList[3][0].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[1].spouse.url"
+ @click="getPersonInfo(rootSecList[1].spouse.userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_8" v-if="isShow_2">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[3][1].url"
- @click="getPersonInfo(rootSecList[3][1].userId)">
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[3].spouse.url"
+ @click="getPersonInfo(rootSecList[3].spouse.userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">
- <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][0].url"
- @click="getPersonInfo(rootSecList[0][0].userId)">
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_1" v-if="isShow_3">-->
+<!-- <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].url"-->
+<!-- @click="getPersonInfo(rootThiList[0].userId)">-->
+<!-- </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"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_2" v-if="isShow_3">-->
+<!-- <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].url"-->
+<!-- @click="getPersonInfo(rootThiList[0].userId)">-->
+<!-- </el-avatar>-->
- <el-avatar shape="circle" class="avater_3_3" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_3" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
- <el-avatar shape="circle" class="avater_3_4" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_4" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
<el-avatar shape="circle" class="avater_3_5" 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/'+ rootThiList[0].url"
+ @click="getPersonInfo(rootThiList[0].userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_3_6" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_6" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
- <el-avatar shape="circle" class="avater_3_7" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_7" v-if="isShow_4">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
<el-avatar shape="circle" class="avater_3_8" 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/'+ rootThiList[0].spouse.url"
+ @click="getPersonInfo(rootThiList[0].spouse.userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_3_9" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_9" v-if="isShow_3">-->
+<!-- <img :src="'http://47.93.189.255:8080/'+ rootThiList[0].spouse.url"-->
+<!-- @click="getPersonInfo(rootThiList[0].spouse.userId)">-->
+<!-- </el-avatar>-->
<el-avatar shape="circle" class="avater_3_10" 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/'+ rootThiList[1].url"
+ @click="getPersonInfo(rootThiList[1].userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_3_11" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
- <el-avatar shape="circle" class="avater_3_12" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_11" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
+<!-- <el-avatar shape="circle" class="avater_3_12" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
<el-avatar shape="circle" class="avater_3_13" 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/'+ rootThiList[1].spouse.url"
+ @click="getPersonInfo(rootThiList[1].spouse.userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_3_14" 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/'+ rootThiList[2].url"
+ @click="getPersonInfo(rootThiList[2].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_3_15" 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/'+ rootThiList[2].spouse.url"
+ @click="getPersonInfo(rootThiList[2].spouse.userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_3_16" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_16" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
<el-avatar shape="circle" class="avater_3_17" 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/'+ rootThiList[3].url"
+ @click="getPersonInfo(rootThiList[3].userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_3_18" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
- <el-avatar shape="circle" class="avater_3_19" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
- <el-avatar shape="circle" class="avater_3_20" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
- <el-avatar shape="circle" class="avater_3_21" v-if="isShow_3">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
- <el-avatar shape="circle" class="avater_4_1" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_3_18" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
+<!-- <el-avatar shape="circle" class="avater_3_19" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
+<!-- <el-avatar shape="circle" class="avater_3_20" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
+<!-- <el-avatar shape="circle" class="avater_3_21" v-if="isShow_3">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
+<!-- <el-avatar shape="circle" class="avater_4_1" v-if="isShow_4">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
<el-avatar shape="circle" class="avater_4_2" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootFouList[0].url"
+ @click="getPersonInfo(rootFouList[0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_4_3" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootFouList[1].url"
+ @click="getPersonInfo(rootFouList[1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_4_4" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootFouList[2].url"
+ @click="getPersonInfo(rootFouList[2].userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_4_5" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
- <el-avatar shape="circle" class="avater_4_6" v-if="isShow_4">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
- </el-avatar>
+<!-- <el-avatar shape="circle" class="avater_4_5" v-if="isShow_4">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
+<!-- <el-avatar shape="circle" class="avater_4_6" v-if="isShow_4">-->
+<!-- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"-->
+<!-- ></el-img>-->
+<!-- </el-avatar>-->
</div>
</div>
@@ -200,11 +200,13 @@
dropdownList: [
{ name: '鍙樉绀虹涓�浠�', src: 'Group 407.png' },
{ name: '鏄剧ず鑷崇浜屼唬', src: 'Group 407.png' },
- { name: '鏄剧ず鑷崇涓変唬', src: 'Group 445.png' },
+ { name: '鏄剧ず鑷崇涓変唬', src: 'Group 407.png' },
{ name: '鏄剧ず鍏ㄩ儴', src: 'Group 407.png' }
],
rootList:[],
rootSecList:[],
+ rootThiList:[],
+ rootFouList:[],
loading: true,
formData:[],
isShow_1:false,
@@ -302,13 +304,10 @@
}
},
- created() {
+ created(){
this.setGreeting();
this.getUser();
- },
- mounted() {
- this.getList(1);
},
methods:{
getInfo(src)
@@ -334,94 +333,108 @@
generation_1(){
// alert(127)
// this.getList(1)
- listRoot(1).then(response => {
- this.rootList = response.data
- this.isShow_1=true
- this.isShow_2=false
- this.isShow_3=false
- this.isShow_4=false
- })
+ listRoot(4).then(response => {
+ this.rootList = response.data
+ this.isShow_1=true
+ this.isShow_2=false
+ this.isShow_3=false
+ this.isShow_4=false
+ })
},
getPersonInfo(id)
{
- this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
+ // this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
//alert(id)
},
generation_2(){
// alert(2356)
//this.getList(2);
- let st = new Map()
+ // let st = new Map()
this.rootSecList = []
- listRoot(2).then(response => {
+ listRoot(4).then(response => {
this.rootList = response.data
- // console.log(this.rootList[0].childList)
- // alert(this.rootList[0].childList.length)
- for(let i = 0; i < this.rootList[0].childList.length; i++)
- {
- // alert(343)
- if(st.has(this.rootList[0].childList[i].userId)!=true)
- {
- // alert(35)
- st.set(this.rootList[0].childList[i].userId, 1);
- st.set(this.rootList[0].childList[i].spouseId,1)
- let spid = this.rootList[0].childList[i].spouseId
- let gen = []
+ this.getGenByNum(this.rootSecList, this.rootList[0], 1, 2)
+ // console.log(this.rootSecList)
+ // alert(this.rootSecList[0].url)
+ // for(let i = 0; i < this.rootList[0].childList.length; i++)
+ // {
+ // // if(st.has(this.rootList[0].childList[i].userId)!=true)
+ // //{
+ // // st.set(this.rootList[0].childList[i].userId, 1);
+ // // st.set(this.rootList[0].childList[i].spouseId,1)
+ // // let spid = this.rootList[0].childList[i].spouseId
+ // let gen = []
+ // gen.push(this.rootList[0].childList[i])
+ // this.rootSecList.push(gen)
+ // // }
- gen.push(this.rootList[0].childList[i])
- for(let j = 0; j < this.rootList[0].childList.length; j++)
- {
- if(this.rootList[0].childList[j].userId==spid)
- {
- gen.push(this.rootList[0].childList[j])
- break
- }
- }
- this.rootSecList.push(gen)
- }
+ // }
this.isShow_2=true
this.isShow_1=true
this.isShow_3=false
this.isShow_4=false
- }
- // console.log(this.rootSecList)
+ // console.log(this.rootSecList)
})
},
generation_3(){
- this.getList(3);
+ this.getList(4);
+ //鍐欑3浠ｇ殑浠ｇ爜閫昏緫锛岀敤涓や釜for寰幆鍐欑3浠�
+ this.getGenByNum(this.rootThiList, this.rootList[0], 1, 3)
+ console.log(this.rootThiList)
this.isShow_2=true
this.isShow_3=true
this.isShow_4=false
},
generation_4(){
this.getList(4);
+ // alert(32)
+ this.getGenByNum(this.rootFouList, this.rootList[0], 1, 4)
+ console.log(this.rootFouList)
+ // console.log('-=23-------')
this.isShow_2=true
this.isShow_3=true
this.isShow_4=true
},
+ getGenByNum(genData,data,fir,num)
+ {
+ //console.log(data)
+ if(data==null||fir>num)
+ return
+ if(fir==num)
+ {
+ // alert(fir)
+ genData.push(data);
+ return
+ }
+ // console.log(data)
+ // // console.log(data[0].childList)
+ // console.log('----------------')
+ for(var i = 0; i < data.childList.length; i++)
+ {
+ this.getGenByNum(genData, data.childList[i], fir + 1, num);
+ }
+ },
getList(depth) {
this.loading = true;
- // alert(23)
- // alert(45)
- // console.log(this.queryParams)
-
- // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listRoot(depth).then(response => {
- // alert(123)
- // alert(123)
- // console.log(response.data)
- // alert(90)
this.rootList = response.data;
this.isShow_1=true
- // alert(this.rootList[0].url)
+ // alert(this.rootList[0].url)
// this.total = response.data.total;
+ console.log(this.rootList)
+ // alert(45)
this.loading = false;
+ // console.log(this.rootList)
+
}
);
},
+
+ //闂�欙紙鏃堕棿鍒ゆ柇锛�
setGreeting() {
const currentTime = new Date();
const currentHour = currentTime.getHours();
@@ -436,12 +449,13 @@
this.greeting = "鏅氫笂濂�";
}
},
-
+ //闂�欙紙鑾峰彇鐢ㄦ埛鍚嶇О锛�
getUser() {
getUserProfile().then(response => {
this.user = response.data;
-
+ this.getList(4);
});
+
}
}
}
@@ -486,7 +500,7 @@
}
.avater_2_1{
position: absolute;
- top: 75%;
+ top: 73%;
left: 43%;
transform: translate(-50%, -50%);
width: 44px;
@@ -505,7 +519,7 @@
}
.avater_2_3{
position: absolute;
- top: 67%;
+ top: 66%;
left: 55%;
transform: translate(-50%, -50%);
width: 44px;
@@ -515,7 +529,7 @@
}
.avater_2_4{
position: absolute;
- top: 76%;
+ top: 75%;
left: 59%;
transform: translate(-50%, -50%);
width: 36px;
@@ -525,7 +539,7 @@
}
.avater_2_5{
position: absolute;
- top: 73%;
+ top: 72%;
left: 38%;
transform: translate(-50%, -50%);
width: 37px;
@@ -535,7 +549,7 @@
}
.avater_2_6{
position: absolute;
- top: 62%;
+ top: 60%;
left: 43%;
transform: translate(-50%, -50%);
width: 34px;
@@ -545,7 +559,7 @@
}
.avater_2_7{
position: absolute;
- top: 62%;
+ top: 60%;
left: 59%;
transform: translate(-50%, -50%);
width: 35px;
@@ -604,7 +618,7 @@
}
.avater_3_5{
position: absolute;
- top: 48%;
+ top: 51%;
left: 29%;
transform: translate(-50%, -50%);
width: 42px;
@@ -634,8 +648,8 @@
}
.avater_3_8{
position: absolute;
- top: 22%;
- left: 34%;
+ top: 26%;
+ left: 33%;
transform: translate(-50%, -50%);
width: 56px;
height: 58px;
@@ -653,7 +667,7 @@
}
.avater_3_10{
position: absolute;
- top: 42%;
+ top: 44%;
left: 43%;
transform: translate(-50%, -50%);
width: 41px;
@@ -683,7 +697,7 @@
}
.avater_3_13{
position: absolute;
- top: 37%;
+ top: 40%;
left: 51%;
transform: translate(-50%, -50%);
width: 41px;
@@ -693,7 +707,7 @@
}
.avater_3_14{
position: absolute;
- top: 33%;
+ top: 36%;
left: 57%;
transform: translate(-50%, -50%);
width: 35px;
@@ -703,7 +717,7 @@
}
.avater_3_15{
position: absolute;
- top: 35%;
+ top: 38%;
left: 64%;
transform: translate(-50%, -50%);
width: 38px;
@@ -723,7 +737,7 @@
}
.avater_3_17{
position: absolute;
- top: 56%;
+ top: 59%;
left: 71%;
transform: translate(-50%, -50%);
width: 32px;
@@ -782,7 +796,7 @@
}
.avater_4_2{
position: absolute;
- top: 23%;
+ top: 26%;
left: 40%;
transform: translate(-50%, -50%);
width: 35px;
@@ -792,7 +806,7 @@
}
.avater_4_3{
position: absolute;
- top: 11%;
+ top: 14%;
left: 46%;
transform: translate(-50%, -50%);
width: 47px;
@@ -802,7 +816,7 @@
}
.avater_4_4{
position: absolute;
- top: 17%;
+ top: 20%;
left: 57%;
transform: translate(-50%, -50%);
width: 39px;
--
Gitblit v1.9.1