diff --git a/nezha-fronted/src/components/common/project/popData/popDataInfo.vue b/nezha-fronted/src/components/common/project/popData/popDataInfo.vue new file mode 100644 index 000000000..84c28729c --- /dev/null +++ b/nezha-fronted/src/components/common/project/popData/popDataInfo.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue index 44d63005d..b6d51f89b 100644 --- a/nezha-fronted/src/components/common/project/topology.vue +++ b/nezha-fronted/src/components/common/project/topology.vue @@ -69,8 +69,12 @@
-
total
-
info
+
+ total +
+
+ +
@@ -117,12 +121,14 @@ import addNode from './addNode' import addLine from './addLine' import popDataMain from './popData/popDataMain' + import popDataInfo from './popData/popDataInfo' export default { name:"topology", components: { 'add-model':addNode, 'add-line':addLine, 'popDataMain':popDataMain, + 'popDataInfo':popDataInfo, }, props:{ nodesArray:{ @@ -214,12 +220,12 @@ image:'', }, popData:[ - {top:'-20px', left:'-17px',className:'nz-icon-endpoint',id:'1'}, - {top:'-20px', left:'28px',className:'nz-icon-shujuku',id:'2'}, - {top:'18px', left:'52px',className:'nz-icon-chart',id:'3'}, - {top:'56px', left:'28px',className:'',id:'4'}, - {top:'56px', left:'-17px',className:'nz-icon-info-normal',id:'5'}, - {top:'18px', left:'-38px',className:'nz-icon-gaojing',id:'6'}, + {top:'-20px', left:'-17px',className:'nz-icon-endpoint',id:'endpoint'}, + {top:'-20px', left:'28px',className:'nz-icon-shujuku',id:'asset'}, + {top:'18px', left:'52px',className:'nz-icon-chart',id:'total'}, + {top:'56px', left:'28px',className:'',id:'other'}, + {top:'56px', left:'-17px',className:'nz-icon-info-normal',id:'info'}, + {top:'18px', left:'-38px',className:'nz-icon-gaojing',id:'alert'}, ], popDataShow:{ endpoint:false, @@ -457,7 +463,7 @@ // 工具的点击 对应的操作 popClick(id){ - this.popDataShowUpdate(); + this.popDataShowUpdate(id); }, modelTopUpdate(){//model上的图标 实时更新 this.modelTop=[]; @@ -498,8 +504,9 @@ modelTopClick(item,index){ this.index=index; this.selNodeId=item.id; - if(this.selNodeId&&this.networkPopShow){ + if(this.selNodeId){ this.setPopPosition(this.selNodeId); + this.popDataShowUpdate('main') } }, // 数组取差集 diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue index 4afb33de3..c1eee61a5 100644 --- a/nezha-fronted/src/components/common/project/visNetwork.vue +++ b/nezha-fronted/src/components/common/project/visNetwork.vue @@ -211,6 +211,9 @@ @import './chart.scss';