Merge branch 'zxm' of http://124.70.32.114:3100/zhangxiaomeng/kechengfuzhu into wzx

# Conflicts:
#	kcui/src/view/Graph.vue

kcui/src/view/Graph.vue

@@ -1,10 +1,12 @@
 <template>
   <div style="width: 100%;height: 100%;">
     <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 style="background-color: silver;width: 3vw;height: 2vw;line-height: 2vw;text-align: center;" @click="goBook">
+        跳转1
+      </div>
       <div class="stText">关键字:</div>
       <input class="stInput" placeholder="请输入关键字" v-model="keywords"/>
-      <div @click="getInfo"
+      <div @click="getInfo1"
            style="width: 4vw;height: 2vw;margin-left:0.2vw;background-color: #0AB7FD;float: right;font-size: 1vw;line-height: 2vw;text-align: center;border-radius:2vw;margin-top: 0.1vw;">
         查询
       </div>
@@ -30,9 +32,10 @@
         </el-form-item>
         <el-form-item label="类型">
           <el-select v-model="typeValue" placeholder="请选择类型">
-            <el-option label="图文" value="图文"></el-option>
-            <el-option label="视频" value="视频"></el-option>
-            <el-option label="动画" value="动画"></el-option>
+            <el-option label="图文" value="tw"></el-option>
+            <el-option label="视频" value="sp"></el-option>
+            <el-option label="动画" value="dh"></el-option>
+            <el-option label="计算模块" value="jsmk"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="节点名称">
@@ -70,7 +73,7 @@ import {addNode, getFileIdByDocId} from "@/api/file";
 
 export default {
   // eslint-disable-next-line vue/multi-word-component-names
-  name: 'Graph',
+  name: 'Home',
   data() {
     return {
       infos: [],
@@ -101,16 +104,10 @@ export default {
     onCreated(editor) {
       this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
     },
-    // getInfo(){
-    //   var data = {}
-    //   getgraphInfo(data).then((res)=>{
-    //     this.zhengl(res.data);
-    //
-    //   })
-    // },
     getInfo() {
+      this.graphData = undefined;
+      this.demoData = {}
 
-      this.data = undefined;
       if (this.keywords != '' && this.keywords != undefined) {
         this.visGraph.clearAll();
         let params = {
@@ -122,7 +119,28 @@ export default {
       } else {
 
         let params = {};
+        getgraphInfo(params).then((res) => {
+          this.zhengl(res.data);
+        })
+      }
+
 
+    },
+    getInfo1() {
+      this.graphData = undefined;
+      this.demoData = {}
+
+      if (this.keywords != '' && this.keywords != undefined) {
+        this.visGraph.clearAll();
+        let params = {
+          nodename: this.keywords,
+        };
+        getgraphInfo(params).then((res) => {
+          this.zhengl(res.data);
+        })
+      } else {
+        this.visGraph.clearAll();
+        let params = {};
         getgraphInfo(params).then((res) => {
           this.zhengl(res.data);
         })
@@ -130,24 +148,20 @@ export default {
 
 
     },
+
     async drawGraphData() {
       this.graphData = this.demoData;
       if (this.visGraph === null) {
         this.createGraph();
         // this.genrateGraphData();
         this.visGraph.drawData(this.graphData);
-        // this.refreshGraphData();
         this.visGraph.incremaNodesCodinate(this.graphData.nodes);
         this.reLayout();
-        // this.goCenter();
       } else {
         this.createGraph();
-
         this.visGraph.drawData(this.graphData);
-        // this.refreshGraphData();
         this.visGraph.incremaNodesCodinate(this.graphData.nodes);
         this.reLayout();
-        // this.goCenter();
       }
       this.loading = false;
 
@@ -166,8 +180,6 @@ export default {
       this.visGraph = new VisGraph(document.getElementById('graph-panel'), configWithEvents);
     },
     async showPopup(node) {
-      console.log("o----------")
-      console.log(node)
       this.selectedNode = node;
       this.newBranchParentId = node.properties.docId;
       this.newBranchLevel = parseInt(node.properties.level) + 1;
@@ -343,23 +355,17 @@ export default {
 
       return styles[group] || {};
     },
-    // doLogin(){
-    //   userLogin().then((res)=>{
-    //     console.log(res);
-    //     this.testInfo();
-    //     this.getInfo();
-    //   })
-    // },
     testInfo() {
       test().then((res) => {
         console.log(res);
       })
     }
+
   },
+
   mounted() {
-        this.doLogin();
+    this.testInfo();
     this.getInfo();
-
   }
 }
 </script>