From 3bff53abcb2af4cf9332db4340a7c46b1ab58fe5 Mon Sep 17 00:00:00 2001
From: zhangxiaomeng <1362468712@qq.com>
Date: Tue, 21 Jan 2025 09:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kcui/src/assets/js/graphvis.min.20241008.js |  2 +-
 kcui/src/router/router.js                   | 14 +++----
 kcui/src/view/Home.vue                      | 60 ++++++++++++++++++-----------
 kcui/src/view/TWInfo.vue                    |  1 -
 4 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/kcui/src/assets/js/graphvis.min.20241008.js b/kcui/src/assets/js/graphvis.min.20241008.js
index 35dc98a..c76fc71 100644
--- a/kcui/src/assets/js/graphvis.min.20241008.js
+++ b/kcui/src/assets/js/graphvis.min.20241008.js
@@ -2622,7 +2622,7 @@
                   }
                 }
                 else {
-                  console.log(this.radius)
+
                   return (
                       (x - this.cx) * (x - this.cx) + (y - this.cy) * (y - this.cy) <
                       this.radius * this.scaleX * this.radius * this.scaleX
diff --git a/kcui/src/router/router.js b/kcui/src/router/router.js
index c3db2a1..5f90fc6 100644
--- a/kcui/src/router/router.js
+++ b/kcui/src/router/router.js
@@ -1,7 +1,7 @@
 //1.导入vue 和 vuerouter 的包
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-// import Home from '@/view/Home.vue'
+import Home from '@/view/Home.vue'
 import Book from '@/view/Book.vue'
 import TwInfo from '@/view/TWInfo.vue'
 
@@ -12,18 +12,18 @@ Vue.use(VueRouter)
 
 export default new VueRouter({
     routes: [              //配置路由，这里是个数组
-        // {                    //每一个链接都是一个对象
-        //     path: '/',         //链接路径
-        //     name: 'Home',     //路由名称，
-        //     component: Home   //对应的组件模板
-        // },
+        {                    //每一个链接都是一个对象
+            path: '/',         //链接路径
+            name: 'Home',     //路由名称，
+            component: Home   //对应的组件模板
+        },
         {                    //每一个链接都是一个对象
             path: '/Book',         //链接路径
             name: 'Book',     //路由名称，
             component: Book   //对应的组件模板
         },
         {                    //每一个链接都是一个对象
-            path: '/',         //链接路径
+            path: '/TwInfo',         //链接路径
             name: 'TwInfo',     //路由名称，
             component: TwInfo   //对应的组件模板
         },
diff --git a/kcui/src/view/Home.vue b/kcui/src/view/Home.vue
index f81713c..a48ab4a 100644
--- a/kcui/src/view/Home.vue
+++ b/kcui/src/view/Home.vue
@@ -3,14 +3,17 @@
     <div style="width: 100%;height: 4vw;background-color: #42b983;">
       <div style="background-color: silver;width: 3vw;height: 2vw;line-height: 2vw;text-align: center;" @click="goBook">跳转1</div>
     </div>
-    <div style="width: 100%;height: 100%;">
+    <div style="width: 100%;height: 80%;">
       <div class="gContainer">
         <div id="graph-panel" style="width: 100%;height: 100%;"></div>
       </div>
     </div>
 
+
+
+
     <!-- 弹窗 -->
-    <div v-if="isModalVisible" class="modal-overlay" @click.self="closeModal">
+    <div v-if="isModalVisible" style="height: 5vw;width: 100%;"  class="modal-overlay" @click.self="closeModal">
       <div class="modal-content">
         <h3>请输入分支内容</h3>
         <label for="fileId">fileId:</label>
@@ -120,9 +123,11 @@ export default {
       this.visGraph = new VisGraph(document.getElementById('graph-panel'), configWithEvents);
     },
     showPopup(node) {
+      console.log("o----------")
+      console.log(node)
       this.selectedNode = node;
       this.newBranchParentId = node.properties.docId;
-      this.newBranchLevel = node.properties.level - 1;
+      this.newBranchLevel = parseInt(node.properties.level)  + 1;
       this.isModalVisible = true; // 显示模态框
     },
     closeModal() {
@@ -226,34 +231,43 @@ export default {
 
       var nodeList = data.nodes;
       var lineList = data.links;
+      var allOne = ""
 
-      var allOne = nodeList[0].docId
-      for (let a = 0; a < nodeList.length; a++) {
-        const group = parseInt(nodeList[a].group, 10);
-        const style = this.getNodeStyle(group);
+      console.log(nodeList)
+      if(nodeList!=undefined){
+        allOne = nodeList[0].docId
+        for (let a = 0; a < nodeList.length; a++) {
+          const group = parseInt(nodeList[a].group, 10);
+          const style = this.getNodeStyle(group);
 
-        nodes.push({
-          id: nodeList[a].id,
-          label: nodeList[a].name,
-          properties: { name: nodeList[a].name, docId: nodeList[a].docId, parent: allOne },
-          ...style // 展开 style 对象以应用样式属性
-        });
+          nodes.push({
+            id: nodeList[a].id,
+            label: nodeList[a].name,
+            properties: { name: nodeList[a].name, docId: nodeList[a].docId, parent: allOne, leve: nodeList[a].group },
+            ...style // 展开 style 对象以应用样式属性
+          });
+        }
       }
 
+      // var allOne = nodeList[0].docId
+
 
-      for (let b = 0; b < lineList.length; b++) {
+      if(lineList!=undefined){
+        for (let b = 0; b < lineList.length; b++) {
 
-        var bbb = {name: lineList[b].relate}
-        links.push({
-          source: lineList[b].source,
-          target: lineList[b].target,
-          type: lineList[b].relate,
-          properties: bbb,
-          color: '202,202,202',
-          lineWidth: 3,
-        })
+          var bbb = {name: lineList[b].relate}
+          links.push({
+            source: lineList[b].source,
+            target: lineList[b].target,
+            type: lineList[b].relate,
+            properties: bbb,
+            color: '202,202,202',
+            lineWidth: 3,
+          })
+        }
       }
 
+
       this.demoData = {
         "nodes": nodes,
         "links": links
diff --git a/kcui/src/view/TWInfo.vue b/kcui/src/view/TWInfo.vue
index 56f2c75..556d6c8 100644
--- a/kcui/src/view/TWInfo.vue
+++ b/kcui/src/view/TWInfo.vue
@@ -30,7 +30,6 @@
       </div>
       <div class="rightContent">
         <img src="../assets/img/rightBox.png" style="height: 96%;width: 100%;margin-top: 2%;position: absolute;z-index: 1;">
-
         <div class="rigthHeadInfo" style="position: relative;">
           <div style="display: flex;flex-direction: row;">
             <div v-for="item in typeList" :key="item" style="position: relative;">