From 76956e0f6cc235678fce936439ad932a7b8bc344 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期四, 24 八月 2023 21:41:31 +0800
Subject: [PATCH] 8.24提交
---
ruoyi-ui/src/views/homeRoot/index.vue | 218 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 154 insertions(+), 64 deletions(-)
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index 8db644c..117432c 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="container">
- <h1 style="font-size:21px;padding-top:30px">鏃╀笂濂斤紒
+ <h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}
<el-dropdown style="float:right">
<span class="el-dropdown-link">
<img src="../../assets/images/Frame.png">
@@ -20,75 +20,83 @@
<!-- 鑳屾櫙澶у浘-->
<img v-if="imageSrc" :src="imageSrc" alt="" class="background"/>
<!-- 鐢ㄦ埛澶村儚-->
- <div v-model="rootList.url" >
- <el-avatar shape="circle" class="avater_1_1">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+
+ <div v-model="rootList.url">
+ <el-avatar shape="circle" class="avater_1_1" v-if="isShow_1">
+ <img :src="'http://47.93.189.255:8080/'+ rootList[0].url"
+ @click="getPersonInfo(rootList[0].userId)">
</el-avatar>
- <el-avatar shape="circle" class="avater_1_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <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)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_1" v-if="isShow_2">
- <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)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_2" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[0][1].url"
+ @click="getPersonInfo(rootSecList[0][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_3" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][0].url"
+ @click="getPersonInfo(rootSecList[1][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_4" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[1][1].url"
+ @click="getPersonInfo(rootSecList[1][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_5" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][0].url"
+ @click="getPersonInfo(rootSecList[2][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_6" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[2][1].url"
+ @click="getPersonInfo(rootSecList[2][1].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_7" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[3][0].url"
+ @click="getPersonInfo(rootSecList[3][0].userId)">
</el-avatar>
<el-avatar shape="circle" class="avater_2_8" v-if="isShow_2">
- <el-img :src="'http://47.93.189.255:8080'+ rootList.url"
- ></el-img>
+ <img :src="'http://47.93.189.255:8080/'+ rootSecList[3][1].url"
+ @click="getPersonInfo(rootSecList[3][1].userId)">
</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)">
</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_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_5" 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_3">
+
+ <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>
@@ -179,12 +187,15 @@
<script>
-import {listRoot} from "@/api/root";
+import {listRoot} from "@/api/root/index";
+import { getUserProfile } from "@/api/system/user";
export default {
name: "index",
data(){
return{
+ user: {},
+ greeting: "",
imageSrc: require('../../assets/images/Group 407.png') ,
dropdownList: [
{ name: '鍙樉绀虹涓�浠�', src: 'Group 443.png' },
@@ -193,11 +204,13 @@
{ name: '鏄剧ず鍏ㄩ儴', src: 'Group 407.png' }
],
rootList:[],
+ rootSecList:[],
loading: true,
formData:[],
- isShow_2:true,
- isShow_3:true,
- isShow_4:true,
+ isShow_1:false,
+ isShow_2:false,
+ isShow_3:false,
+ isShow_4:false,
formDat:{
userId: undefined,
nickName: undefined,
@@ -252,6 +265,7 @@
url:undefined,
familyId:undefined,
secondFamilyId: undefined,
+ identity:undefined,
childList:[{
userId: undefined,
nickName: undefined,
@@ -279,6 +293,7 @@
url:undefined,
familyId:undefined,
secondFamilyId: undefined,
+ identity:undefined,
childList:undefined
}]
}]
@@ -287,12 +302,10 @@
}
},
- created() {
- this.getList();
- // this.getCateInfor()
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
+
+ created(){
+ this.setGreeting();
+ this.getUser();
},
methods:{
getInfo(src)
@@ -316,40 +329,117 @@
}
},
generation_1(){
- this.isShow_2=false
- this.isShow_3=false
- this.isShow_4=false
+ // 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
+ })
+ },
+ getPersonInfo(id)
+ {
+ this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
+ //alert(id)
},
generation_2(){
- this.isShow_2=true
- this.isShow_3=false
- this.isShow_4=false
+
+ // alert(2356)
+ //this.getList(2);
+ let st = new Map()
+ this.rootSecList = []
+ listRoot(2).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 = []
+
+ 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)
+ })
+
+
},
generation_3(){
+ this.getList(3);
this.isShow_2=true
this.isShow_3=true
this.isShow_4=false
},
generation_4(){
+ this.getList(4);
this.isShow_2=true
this.isShow_3=true
this.isShow_4=true
},
- getList() {
+ getList(depth) {
this.loading = true;
+ // alert(23)
+ // alert(45)
// console.log(this.queryParams)
- // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- listRoot(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.rootList = response.data.data;
- this.total = response.data.total;
+ // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ listRoot(depth).then(response => {
+ this.rootList = response.data;
+ this.isShow_1=true
+ // alert(this.rootList[0].url)
+ // this.total = response.data.total;
this.loading = false;
+ console.log(this.rootList)
}
);
},
+ //闂�欙紙鏃堕棿鍒ゆ柇锛�
+ setGreeting() {
+ const currentTime = new Date();
+ const currentHour = currentTime.getHours();
+
+ if (currentHour < 12) {
+ this.greeting = "鏃╀笂濂�";
+ } else if (currentHour < 14) {
+ this.greeting = "涓崍濂�";
+ } else if (currentHour < 18) {
+ this.greeting = "涓嬪崍濂�";
+ } else {
+ this.greeting = "鏅氫笂濂�";
+ }
+ },
+ //闂�欙紙鑾峰彇鐢ㄦ埛鍚嶇О锛�
+ getUser() {
+ getUserProfile().then(response => {
+ this.user = response.data;
+ this.getList(1);
+ });
+
+ }
}
}
</script>
@@ -374,7 +464,7 @@
}
.avater_1_1 {
position: absolute;
- top: 94%;
+ top: 95%;
left: 51%;
transform: translate(-50%, -50%);
width: 54px;
@@ -384,7 +474,7 @@
}
.avater_1_2{
position: absolute;
- top: 84%;
+ top: 85%;
left: 48%;
transform: translate(-50%, -50%);
width: 45px;
@@ -393,8 +483,8 @@
}
.avater_2_1{
position: absolute;
- top: 72%;
- left: 44%;
+ top: 75%;
+ left: 43%;
transform: translate(-50%, -50%);
width: 44px;
height: 44px;
@@ -402,8 +492,8 @@
}
.avater_2_2{
position: absolute;
- top: 65%;
- left: 48%;
+ top: 67%;
+ left: 47%;
transform: translate(-50%, -50%);
width: 44px;
height: 44px;
@@ -412,7 +502,7 @@
}
.avater_2_3{
position: absolute;
- top: 64%;
+ top: 67%;
left: 55%;
transform: translate(-50%, -50%);
width: 44px;
@@ -422,7 +512,7 @@
}
.avater_2_4{
position: absolute;
- top: 73%;
+ top: 76%;
left: 59%;
transform: translate(-50%, -50%);
width: 36px;
@@ -432,8 +522,8 @@
}
.avater_2_5{
position: absolute;
- top: 70%;
- left: 39%;
+ top: 73%;
+ left: 38%;
transform: translate(-50%, -50%);
width: 37px;
height: 39px;
@@ -442,8 +532,8 @@
}
.avater_2_6{
position: absolute;
- top: 58%;
- left: 44%;
+ top: 62%;
+ left: 43%;
transform: translate(-50%, -50%);
width: 34px;
height: 35px;
@@ -452,7 +542,7 @@
}
.avater_2_7{
position: absolute;
- top: 58%;
+ top: 62%;
left: 59%;
transform: translate(-50%, -50%);
width: 35px;
@@ -462,7 +552,7 @@
}
.avater_2_8{
position: absolute;
- top: 70%;
+ top: 73%;
left: 64%;
transform: translate(-50%, -50%);
width: 45px;
--
Gitblit v1.9.1