From cb62f9fe04c98c30434bb4a3a20bafb57c231ebb Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 05 九月 2023 15:13:56 +0800
Subject: [PATCH] 1.成长经历阅历证件情况可以输入或选择，已改为“持有证件情况” 2.家谱样式调整和两个名字互换位置 3.更新了首页背景图片
---
ruoyi-ui/src/views/mindMap/index.vue | 80 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index 5579db5..5f1fd1a 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -1,10 +1,11 @@
<template>
<div class="app-container">
- <h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}</h1>
+ <div class="text" >
+ <h1 style="font-size: 21px;margin-left: 0">{{ greeting +'锛�' + user.userName }}</h1></div>
<div class="image-container">
<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 "/>
</div>
</template>
@@ -39,9 +40,6 @@
// console.log(this.mapData)
// console.log('sssssssssssssssssss')
},
-
-
-
methods: {
// 鐐瑰嚮鎬濈淮瀵煎浘鑺傜偣鍚庯紝瑙﹀彂鍙橀噺鏇存柊
@@ -83,45 +81,39 @@
const mindMapData = this.rootList[0];
-
// console.log(this.drawData(mindMapData))
this.mapData = this.drawData(mindMapData)
this.showMindMap = true
})
},
- drawData(mpdata)
- {
- if(mpdata==null)
- return null
+ drawData(mpdata) {
+ 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":[]
+ "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": '',
+ "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,23 +124,33 @@
<style scoped>
.app-container{
- background-color: #FEF7FC;
position: relative;
+ /*background-color: transparent;*/
+ /*padding-left: -20px;*/
}
+.text{
+ background-color: #FEF7FC;
+ opacity: 0.75;
+ margin-top: -20px;
+ padding: 20px;
+}
.image-container {
/*position: absolute;*/
position: fixed;
- margin-left: -10px;
- width: 90%;
- height: 90%;
+ top: 50px;
+ left: 50px;
+ width: 100%;
+ height: 100%;
z-index: -1;
}
.mind-map-container{
+ position: fixed;
z-index: 2;
opacity: 0.8;
- /*margin-top: 200px;*/
+ margin-top: 50px;
+ margin-left: 50px;
background-color: transparent;
}
.top-image {
--
Gitblit v1.9.1