diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue index 124115f0e..f03ce94bb 100644 --- a/nezha-fronted/src/components/common/project/addLine.vue +++ b/nezha-fronted/src/components/common/project/addLine.vue @@ -18,31 +18,31 @@ - + Option - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - +
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue index 4992c5977..e950f4e46 100644 --- a/nezha-fronted/src/components/common/project/topology.vue +++ b/nezha-fronted/src/components/common/project/topology.vue @@ -259,7 +259,7 @@ 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.$put('/project/topo',{topo:JSON.stringify({nodes:nodes,lines:edges}),projectId:this.allModuleInfo.basic.id}); this.$emit('editVisNetworkChange',false); }, formatNodes(arr){ @@ -380,6 +380,9 @@ this_.resetAllNodes(); this_.network.stabilize(); }, + setData(){ + this.setNetworkData(this.nodesArray,this.edgesArray); + }, setNetworkData(nodes,edges){//动态设置拓扑图数据 let this_ = this; this.nodes = new Vis.DataSet(nodes); @@ -410,10 +413,10 @@ nodesArray.push(model); this.$emit("setTopologyData",nodesArray,this.edgesArray); this.setNetworkData(nodesArray,this.edgesArray); - this.$nextTick(()=>{ - this.arrayDiff(); - this.$emit('editVisNetworkChange',true); - }) + this.$nextTick(()=>{ + this.arrayDiff(); + this.$emit('editVisNetworkChange',true); + }) }, addModelShow(){ // 显示添加节点弹窗 this.addNodeShow=true; diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue index 4b73470a4..e009df00a 100644 --- a/nezha-fronted/src/components/common/project/visNetwork.vue +++ b/nezha-fronted/src/components/common/project/visNetwork.vue @@ -45,52 +45,52 @@ Description :{{projectInfo.remark?projectInfo.remark:'--'}}
- - Alert state : -
{{projectInfo.alertStat[0]}} -
{{projectInfo.alertStat[1]}} -
{{projectInfo.alertStat[2]}} -
+ + + + + +
Module Mum :{{projectInfo.moduleMum}}
-
+
- {{alertData.title}} - {{alertData.sssObj.total}} + Alert : + {{total}}
-
{{alertData.sssObj.pending}}
+
{{projectInfo.alertStat[0]}}
-
{{alertData.sssObj.stop}}
+
{{projectInfo.alertStat[1]}}
-
{{alertData.sssObj.other}}
+
{{projectInfo.alertStat[2]}}
@@ -116,6 +116,12 @@