From 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/mindMap/index.vue | 178 ++++++++++++++++++++---------------------------------------
1 files changed, 60 insertions(+), 118 deletions(-)
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index 970362a..5f1fd1a 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -1,12 +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"/>
+ <superMindmap v-if="showMindMap" :active='active' :data="mapData" @activeChange="activeChange" class="mind-map-container "/>
</div>
</template>
@@ -15,10 +14,10 @@
import { getUserProfile } from "@/api/system/user";
import { listRootAll ,listRoot} from "@/api/root/index";
import * as d3 from 'd3';
- // 瀵煎叆鎬濈淮瀵煎浘鏁版嵁
- import MapData from '../components/MapData.js'
- // 瀵煎叆鎬濈淮瀵煎浘缁勪欢
- import superMindmap from '../components/superMindmap.vue'
+// 瀵煎叆鎬濈淮瀵煎浘鏁版嵁
+import MapData from '../components/MapData.js'
+// 瀵煎叆鎬濈淮瀵煎浘缁勪欢
+import superMindmap from '../components/superMindmap.vue'
export default {
components:{superMindmap},
@@ -42,25 +41,21 @@
// console.log('sssssssssssssssssss')
},
-
-
-
methods: {
// 鐐瑰嚮鎬濈淮瀵煎浘鑺傜偣鍚庯紝瑙﹀彂鍙橀噺鏇存柊
- activeChange(newLabel) {
- this.active = newLabel
- this.reloadMindMap()
- },
- // 閲嶈浇鎬濈淮瀵煎浘
- reloadMindMap() {
- this.showMindMap = false
- this.$nextTick(
- () => {
- this.showMindMap = true
- }
- )
- },
-
+ activeChange(newLabel) {
+ this.active = newLabel
+ this.reloadMindMap()
+ },
+ // 閲嶈浇鎬濈淮瀵煎浘
+ reloadMindMap() {
+ this.showMindMap = false
+ this.$nextTick(
+ () => {
+ this.showMindMap = true
+ }
+ )
+ },
setGreeting() {
const currentTime = new Date();
@@ -86,127 +81,77 @@
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;
},
- drawMindMap() {
- const mindMapData = this.rootList[0]; // 浠巖ootList涓幏鍙栨暟鎹�
- console.log(mindMapData)
- // 娓呴櫎鐜版湁鐨凷VG鍏冪礌
- // d3.select("#mind-map svg").remove();
-
- // // 鍒涘缓涓�涓柊鐨� div 鍏冪礌浣滀负鍖呰９鎬濈淮瀵煎浘鐨勫鍣�
- // const mindMapContainer = document.createElement("div");
- // mindMapContainer.setAttribute("id", "mind-map-container");
- // mindMapContainer.style.position = "absolute";
- // mindMapContainer.style.top = "0";
- // mindMapContainer.style.left = "0";
- // mindMapContainer.style.width = "100%";
- // mindMapContainer.style.height = "100%";
- // mindMapContainer.style.zIndex = "1";
-
- // // 灏嗘�濈淮瀵煎浘瀹瑰櫒鎻掑叆鍒� image-container 涓�
- // document.querySelector(".image-container").appendChild(mindMapContainer);
-
- // // 鍒涘缓SVG鍏冪礌锛岃缃搴﹀拰楂樺害
- // const svg = d3.select("#mind-map-container")
- // .append("svg")
- // .attr("class", "svg-container") // 娣诲姞 className
- // .attr("width", "100%")
- // .attr("height", "100%");
-
- // // 鍒涘缓鏍硅妭鐐�
- // const root = d3.hierarchy(mindMapData);
- // const treeLayout = d3.tree().size([500, 400]); // 璁剧疆鏍戠姸甯冨眬鐨勫昂瀵�
- // treeLayout(root);
-
- // // 鍒涘缓閾炬帴绾�
- // svg.selectAll(".link")
- // .data(root.descendants().slice(1))
- // .enter()
- // .append("path")
- // .attr("class", "link")
- // .attr("d", d => {
- // return "M" + d.x + "," + d.y + "C" + (d.x + d.parent.x) / 2 + "," + d.y + " " +
- // (d.x + d.parent.x) / 2 + "," + d.parent.y + " " + d.parent.x + "," + d.parent.y;
- // });
-
- // // 鍒涘缓鑺傜偣
- // const nodes = svg.selectAll(".node")
- // .data(root.descendants())
- // .enter()
- // .append("g")
- // .attr("class", "node")
- // .attr("transform", d => "translate(" + d.x + "," + d.y + ")");
-
- // nodes.append("circle")
- // .attr("r", 10);
-
- // nodes.append("text")
- // .attr("dx", 12)
- // .attr("dy", 5)
- // .text(d => d.data.nickName);
- }
}
};
</script>
<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: absolute;*/
+ position: fixed;
+ top: 50px;
+ left: 50px;
width: 100%;
height: 100%;
z-index: -1;
}
.mind-map-container{
+ position: fixed;
z-index: 2;
- opacity: 0.5;
+ opacity: 0.8;
+ margin-top: 50px;
+ margin-left: 50px;
+ background-color: transparent;
}
.top-image {
width: 100%;
@@ -215,7 +160,4 @@
position: static;
opacity: 0.8;
}
-
-
-
</style>
--
Gitblit v1.9.1