From f935749e968691566c3dbcaf16fb8aa2e42d7382 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Wed, 26 Aug 2020 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=B0=83=E7=94=A8=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/popData/alertTable.vue     |  6 +--
 .../common/project/projectFacade.vue          |  4 +-
 .../components/common/project/topology.vue    | 39 +++++++++++++++++--
 .../components/common/project/visNetwork.vue  | 38 +++++++++---------
 4 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 8731c6b73..1d59848f7 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="mc" @click.self="clickOutside">
-    <div class="right-box right-box-project-alert">
+  <!--<div class="mc" @click.self="clickOutside">-->
+    <div class="right-box right-box-project-alert" v-clickoutside="clickOutside">
       <!-- begin--顶部按钮-->
       <div class="right-box-top-btns">
         <!--<button id="edit-ep-del" type="button" @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien nz-btn-style-light ">-->
@@ -147,7 +147,7 @@
         <Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
       </div>
     </div>
-  </div>
+  <!--</div>-->
 </template>
 
 <script>
diff --git a/nezha-fronted/src/components/common/project/projectFacade.vue b/nezha-fronted/src/components/common/project/projectFacade.vue
index 1a05db935..31461cd4e 100644
--- a/nezha-fronted/src/components/common/project/projectFacade.vue
+++ b/nezha-fronted/src/components/common/project/projectFacade.vue
@@ -133,11 +133,9 @@
         this.projectInfo.loading=true;
         this.$get('project/info', {id:n.id}).then(response => {
           if (response.code === 200) {
+            this.projectInfo.loading=false;
             this.projectInfo={...this.projectInfo,...response.data.basic,moduleMum:response.data.module.length};
             this.allModuleInfo=response.data;
-           this.$nextTick(()=>{
-             this.projectInfo.loading=false;
-           })
           }
         });
 
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue
index 1b8cef9c5..4992c5977 100644
--- a/nezha-fronted/src/components/common/project/topology.vue
+++ b/nezha-fronted/src/components/common/project/topology.vue
@@ -256,11 +256,44 @@
     },
     methods:{// 保存拓扑图数据
       saveTopology(){
-        let nodes=[...this.nodesArray];
-        let edges=[...this.edgesArray];
-        console.log(nodes,edges);
+        let nodes=this.formatNodes([...this.nodesArray]);
+        let edges=this.formatEdges([...this.edgesArray]);
+        console.log(nodes,edges,this.nodesArray,this.edgesArray);
+        this.$put('/project/topo',{topo:JSON.stringify({nodes,edges}),projectId:this.allModuleInfo.basic.id});
         this.$emit('editVisNetworkChange',false);
       },
+      formatNodes(arr){
+        let arr1=[];
+        arr.forEach(item=>{
+          let obj={
+            "x": item.x,
+            "y": item.y,
+            "moduleId": item.moduleId,
+            "label":item.label,
+            "iconId": item.iconId,
+            "expressions": item.expressions
+          };
+          arr1.push(obj)
+        });
+        return arr1
+      },
+      formatEdges(arr){
+        let arr1=[];
+        arr.forEach(item=>{
+          let obj={
+            "name": item.lineName,
+            "width": item.width,
+            "arrows": item.arrows,
+            "color": item.color,
+            "source": item.from,
+            "target": item.to,
+            "smooth": item.smooth,
+            "expressions": item.expressions,
+          };
+          arr1.push(obj)
+        });
+        return arr1
+      },
       //拓扑图方法
       init(){
         let this_ = this;
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index 6d61b125e..4b73470a4 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -139,27 +139,26 @@
       alertData:{}
     },
     watch:{
-      allModuleInfo:{
-        immediate: true,
-        deep: true,
-        handler(n){
-          this.getNetworkData(n);
-        },
-      },
+      // allModuleInfo:{
+      //   immediate: true,
+      //   deep: true,
+      //   handler(n){
+      //     this.getNetworkData(n);
+      //   },
+      // },
       projectInfo:{
         immediate: true,
-        deep: true,
-        handler(n){
-          this.getNetworkData(n);
-        },
-      },
-      alertData:{
-        immediate: true,
-        deep: true,
         handler(n){
           this.getNetworkData(n);
         },
       },
+      // alertData:{
+      //   immediate: true,
+      //   deep: true,
+      //   handler(n){
+      //     this.getNetworkData(n);
+      //   },
+      // },
     },
     data () {
       return {
@@ -184,13 +183,16 @@
       },
       getNetworkData(n){
         this.topologyLoading=true;
-        // this.$get('/project/topo',{projectId:n.id}).then(res=>{
-        //   console.log(res);
+        console.log(n);
+        this.$get('/project/topo',{projectId:n.id}).then(res=>{
+          console.log(res);
           setTimeout(()=>{
             this.topologyLoading=false;
+            this.nodesArray=[];
+            this.edgesArray=[];
             this.$refs['topology'].setNetworkData( this.edgesArray,this.nodesArray);
           },500)
-        // })
+        })
       },
       editVisNetworkChange(flag){
         this.editVisNetwork=flag;