From d40f0071502682721e9172838894080f37c9a096 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 16 十月 2020 15:54:25 +0800
Subject: [PATCH] 本机详细信息显示字段更新
---
src/components/serfDiagram/index.vue | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/src/components/serfDiagram/index.vue b/src/components/serfDiagram/index.vue
index 0e87121..f8ad4fd 100644
--- a/src/components/serfDiagram/index.vue
+++ b/src/components/serfDiagram/index.vue
@@ -1,9 +1,8 @@
<template lang='pug'>
.net
- .arrow_box(:style="toolTipStyle")
- p {{toolTipAddr}}
d3-network(
ref='net'
+ :startX="startX"
:net-nodes="nodes"
:net-links="links"
:options="options"
@@ -14,11 +13,11 @@
@node-out='nodeOut'
)
</template>
-
+
<script>
import D3Network from "./vue-d3-network";
import RoleIcon from "./icons.js";
-
+
export default {
name: "SerfDiagram",
components: {
@@ -26,7 +25,10 @@
},
props: {
agent: String,
- members: Array
+ members: Array,
+ sizeX: Number,
+ sizeY: Number,
+ startX: Number
},
data() {
return {
@@ -56,14 +58,14 @@
: ""
});
});
-
+
return n;
},
links() {
let arr = new Array();
let dup = new Array(); // Deduplicate to ensure that two nodes have only one line
const count = this.members.length;
-
+
switch (count) {
case 0:
case 1:
@@ -83,7 +85,7 @@
// is me? skip
continue;
}
-
+
if (!dup["d" + target + i]) {
arr.push({ sid: i, tid: target });
dup["d" + i + target] = 1;
@@ -91,7 +93,7 @@
}
}
}
-
+
return arr;
},
options() {
@@ -102,9 +104,13 @@
nodeLabels: true,
canvas: this.canvas,
linkWidth: 0,
+ // size: {
+ // w: 745,
+ // h: 426
+ // }
size: {
- w: 745,
- h: 426
+ w: this.sizeX || 445,
+ h: this.sizeY || 426
}
};
}
@@ -121,7 +127,7 @@
this.toolTipStyle.display = "block";
this.toolTipStyle.top = node.y - 10 + "px";
this.toolTipStyle.left = node.x + width / 2 - 30 + "px";
-
+
this.toolTipNode = this.members[node.id].nodeName;
this.toolTipAddr = this.members[node.id].Address;
},
@@ -141,11 +147,12 @@
// // is not nodeSelected
// } else {
// this.selectNode(node)
-
+
// }
// this.selectNodesLinks()
// this.$set(this.nodes, node.index, node)
-
+ console.log(event,node)
+ debugger
if (event.timeStamp - this.movement < 200) {
this.$emit("selected-node", event, this.members[node.id]);
}
@@ -185,13 +192,13 @@
}
};
</script>
-
+
<style>
.net {
height: 100%;
margin: 0;
}
-
+
.node {
/* stroke: rgba(18, 120, 98, 0.7); */
stroke: rgba(76, 78, 78, 0.7);
@@ -201,51 +208,51 @@
/* fill: #dcfaf3; */
fill: #e3e4e4;
}
-
+
.node.selected {
stroke: #caa455;
}
-
+
.node.pinned {
stroke: rgba(190, 56, 93, 0.6);
}
-
+
.link {
stroke: rgba(18, 120, 98, 0.3);
}
-
+
.link,
.node {
stroke-linecap: round;
}
-
+
.link:hover,
.node:hover {
stroke: #df8108;
stroke-width: 1px;
cursor: pointer;
}
-
+
.link.selected {
stroke: rgba(202, 164, 85, 0.6);
}
-
+
.curve {
fill: none;
}
-
+
.link-label,
.node-label {
/* fill: #127862; */
fill: rgba(76, 78, 78, 0.7);
}
-
+
.link-label {
-webkit-transform: translateY(-0.5em);
transform: translateY(-0.5em);
text-anchor: middle;
}
-
+
.arrow_box {
position: absolute;
background: #fff;
@@ -254,7 +261,7 @@
font-size: 11px;
padding-left: 5px;
}
-
+
.arrow_box p {
height: 30px;
line-height: 30px;
@@ -272,7 +279,7 @@
position: absolute;
pointer-events: none;
}
-
+
.arrow_box:after {
border-color: rgba(136, 183, 213, 0);
border-right-color: #fff;
@@ -285,4 +292,4 @@
border-width: 6px;
margin-top: -6px;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0