From 4bb9f72e6caf2a1a5d54d62cca3bcba2ad2de825 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 24 八月 2023 22:37:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/mindMap/index.vue | 54 +++++++++++++++------------
ruoyi-ui/src/assets/images/zhang.png | 0
ruoyi-ui/src/views/homeRoot/index.vue | 37 ++++++++----------
3 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/ruoyi-ui/src/assets/images/zhang.png b/ruoyi-ui/src/assets/images/zhang.png
index 094051f..a16a0d0 100644
--- a/ruoyi-ui/src/assets/images/zhang.png
+++ b/ruoyi-ui/src/assets/images/zhang.png
Binary files differ
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index 8cab150..117432c 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -198,8 +198,8 @@
greeting: "",
imageSrc: require('../../assets/images/Group 407.png') ,
dropdownList: [
- { name: '鍙樉绀虹涓�浠�', src: 'Group 407.png' },
- { name: '鏄剧ず鑷崇浜屼唬', src: 'Group 407.png' },
+ { name: '鍙樉绀虹涓�浠�', src: 'Group 443.png' },
+ { name: '鏄剧ず鑷崇浜屼唬', src: 'Group 444.png' },
{ name: '鏄剧ず鑷崇涓変唬', src: 'Group 445.png' },
{ name: '鏄剧ず鍏ㄩ儴', src: 'Group 407.png' }
],
@@ -302,13 +302,10 @@
}
},
- created() {
+ created(){
this.setGreeting();
this.getUser();
- },
- mounted() {
- this.getList(1);
},
methods:{
getInfo(src)
@@ -334,17 +331,17 @@
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(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);
+ this.$router.push("/familymodel/jiagenwang/personInfo/" + id);
//alert(id)
},
generation_2(){
@@ -385,7 +382,7 @@
this.isShow_3=false
this.isShow_4=false
}
- // console.log(this.rootSecList)
+ // console.log(this.rootSecList)
})
@@ -410,15 +407,12 @@
// 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;
this.loading = false;
+ console.log(this.rootList)
}
);
},
@@ -442,8 +436,9 @@
getUser() {
getUserProfile().then(response => {
this.user = response.data;
-
+ this.getList(1);
});
+
}
}
}
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
index e8a14cf..83f0819 100644
--- a/ruoyi-ui/src/views/mindMap/index.vue
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -3,16 +3,12 @@
<h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}</h1>
<div class="image-container">
<img class="top-image" src="../../assets/images/zhang.png" alt="Top Image">
- <img class="bottom-image" src="../../assets/images/bkg.png" alt="Bottom Image">
-
- <el-card class="mind-map-container ">
- <div id="mind-map">
-
- </div>
- </el-card>
-
</div>
+ <el-card class="mind-map-container">
+ <div id="mind-map">
+ </div>
+ </el-card>
</div>
</template>
@@ -20,6 +16,7 @@
import { getUserProfile } from "@/api/system/user";
import { listRootAll ,listRoot} from "@/api/root/index";
import * as d3 from 'd3';
+
export default {
name: "index",
@@ -61,15 +58,30 @@
})
},
+
drawMindMap() {
const mindMapData = this.rootList[0]; // 浠巖ootList涓幏鍙栨暟鎹�
// 娓呴櫎鐜版湁鐨凷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")
+ const svg = d3.select("#mind-map-container")
.append("svg")
+ .attr("class", "svg-container") // 娣诲姞 className
.attr("width", "100%")
.attr("height", "100%");
@@ -112,34 +124,28 @@
<style scoped>
.app-container{
background-color: #FEF7FC;
+ position: relative;
}
.image-container {
- position: relative;
+ position: absolute;
width: 100%;
height: 100%;
+ z-index: -1;
}
.mind-map-container{
- z-index: 3;
+ z-index: 2;
+ opacity: 0.5;
}
.top-image {
- width: 50%;
- /*height: 100%;*/
- object-fit: cover;
- position: absolute;
- top: 0;
- right: 0;
- opacity: 1;
-}
-
-.bottom-image {
- z-index: 1; /* 璁剧疆搴曞眰鍥剧墖鐨勫眰绾т负1 */
width: 100%;
height: 100%;
- /*position: absolute;*/
- top: 0;
+ object-fit: cover;
+ position: static;
+ opacity: 0.8;
}
+
</style>
--
Gitblit v1.9.1