Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

 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>
@@ -42,9 +41,6 @@
   // console.log('sssssssssssssssssss')
  },




  methods: {
     // 点击思维导图节点后，触发变量更新
                activeChange(newLabel) {
@@ -60,7 +56,6 @@
                        }
                    )
                },


    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)
    {
    drawData(mpdata) {
      if(mpdata==null)
        return null
        return null;
      var data = {
        "label": mpdata['nickName'],
        "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
        "prop": mpdata['nickName'],
        "url": '',
        "link": '',
        "link": mpdata['nickName'],
        "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++)
      {
        for (var i = 0; i < mpdata['childList'].length; i++) {
        var dt = {
          "label": mpdata['childList'][i]['nickName'],
            "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : '',
          "prop": mpdata['childList'][i]['nickName'],
          "url": '',
          "link": "",
            "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]));
        }
        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)
          data['children'].push(dt);
      }
      }
      return data;
    },

    drawMindMap() {
      const mindMapData = this.rootList[0]; // 从rootList中获取数据
      console.log(mindMapData)
      // 清除现有的SVG元素
      // 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>