From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/mindMap/index.vue | 117 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index 5579db5..ef9bdd5 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -1,10 +1,13 @@
<template>
<div class="app-container">
- <h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}</h1>
- <div class="image-container">
+<!-- <div class="text" style="background-color: #FEF7FC;" >
+ <h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}</h1></div> -->
+ <div class="image-container" style="background-color: #FEF7FC;">
<img class="top-image" src="../../assets/images/zhang.png" alt="Top Image">
</div>
- <superMindmap v-if="showMindMap" :active='active' :data="mapData" @activeChange="activeChange" class="mind-map-container"/>
+ <superMindmap v-if="showMindMap" :active='active' :data="mapData" @activeChange="activeChange" class="mind-map-container ">
+
+ </superMindmap>
</div>
</template>
@@ -32,16 +35,13 @@
};
},
mounted() {
- this.setGreeting();
+ // this.setGreeting();
this.getUser();
// this.mapData = MapData.webMap
// console.log(this.mapData)
// console.log('sssssssssssssssssss')
},
-
-
-
methods: {
// 鐐瑰嚮鎬濈淮瀵煎浘鑺傜偣鍚庯紝瑙﹀彂鍙橀噺鏇存柊
@@ -78,50 +78,53 @@
getUserProfile().then(response => {
this.user = response.data;
});
- listRoot(4).then(response =>{
+ let clanId = this.$store.state.user.clanId
+ // alert(clanId)
+ listRoot(10,clanId).then(response =>{
this.rootList =response.data;
const mindMapData = this.rootList[0];
-
-
- // console.log(this.drawData(mindMapData))
+ console.log(mindMapData)
+ // for(let i = 0; i < )
+ console.log('9999')
+ // console.log(this.drawData(mindMapData))
this.mapData = this.drawData(mindMapData)
this.showMindMap = true
})
},
- drawData(mpdata)
- {
- if(mpdata==null)
- return null
+ drawData(mpdata) {
+ let tp = "https://www.bendudu.com:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg"
+ if (mpdata == null)
+ return null;
var data = {
- "label": mpdata['nickName'],
+ "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
"prop": mpdata['nickName'],
- "url": '',
- "link": '',
- "children":[]
- }
- if(eval(mpdata['spouse'])!=null)
- data['link'] = eval(mpdata['spouse']).nickName
- if(mpdata['childList']!=null){
- for(var i = 0; i < mpdata['childList'].length; i++)
- {
- var dt = {
- "label": mpdata['childList'][i]['nickName'],
- "prop": mpdata['childList'][i]['nickName'],
- "url": '',
- "link": "",
- "children":[]
+ "url": mpdata['url']!=null?'https://www.bendudu.com:8080/'+mpdata['url']:tp,
+ "purl": mpdata['spouse'] != null ? (mpdata['spouse'].url!=null? 'https://www.bendudu.com:8080/'+mpdata['spouse'].url:tp):tp,
+ "id": mpdata['userId'],
+ "link": mpdata['nickName'],
+ "children": []
+ };
+
+ if (mpdata['childList'] != null) {
+ for (var i = 0; i < mpdata['childList'].length; i++) {
+ var dt = {
+ "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : "",
+ "prop": mpdata['childList'][i]['nickName'],
+ "url": mpdata['childList'][i]['url']!=null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url']:tp,
+ "id": mpdata['childList'][i]['userId'],
+ "purl": (mpdata['childList'][i]['spouse'] != null ) ?( mpdata['childList'][i]['spouse'].url!= null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['spouse'].url:tp):tp,
+ "link": mpdata['childList'][i]['nickName'],
+ "children": []
+ };
+ if (mpdata['childList'][i]['childList'] != null) {
+ for (var j = 0; j < mpdata['childList'][i]['childList'].length; j++) {
+ dt['children'].push(this.drawData(mpdata['childList'][i]['childList'][j]));
+ }
+ }
+ data['children'].push(dt);
}
- if(eval(mpdata['childList'][i]['spouse'])!=null)
- dt['link'] = eval(mpdata['childList'][i]['spouse']).nickName
- if(mpdata['childList'][i]['childList']!=null)
- {
- for(var j = 0; j < mpdata['childList'][i]['childList'].length;j++)
- dt['children'].push(this.drawData(mpdata['childList'][i]['childList'][j]))
- }
- data['children'].push(dt)
- }
}
return data;
},
@@ -132,24 +135,35 @@
<style scoped>
.app-container{
- background-color: #FEF7FC;
position: relative;
+ background-color: transparent;
+ /*padding-left: -30px;*/
+ margin-top:-30px;
+ margin-left: -20px;
}
-
+.text{
+ opacity: 0.75;
+ padding: 10px;
+}
.image-container {
- /*position: absolute;*/
- position: fixed;
- margin-left: -10px;
- width: 90%;
- height: 90%;
+ position: absolute;
+ /*position: fixed;*/
+ top: 50px;
+ /*left:-20px;*/
+ width: 110%;
+ height: 100%;
z-index: -1;
}
.mind-map-container{
- z-index: 2;
- opacity: 0.8;
- /*margin-top: 200px;*/
- background-color: transparent;
+ /*position: fixed;*/
+
+ overflow: auto;
+ z-index: 1;
+ opacity: 1;
+ margin-top: 5%;
+ margin-left: 12%;
+ /*background-color: transparent;*/
}
.top-image {
width: 100%;
@@ -157,5 +171,6 @@
object-fit: cover;
position: static;
opacity: 0.8;
+ overflow: auto;
}
</style>
--
Gitblit v1.9.1