diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index ec4a65488..28d104b13 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -887,6 +887,24 @@ const cn = {
type: "类型",
description: "描述"
},
+ topology:{
+ line:'线',
+ module:'组件',
+ add:'添加',
+ selTwoNode:'请选择两个组件',
+ save:'保存',
+ cancel:'取消',
+ addLine:'添加连线',
+ lineName:'连线名称',
+ width:'宽度',
+ option:'设置',
+ arrows:'箭头方向',
+ color:'颜色',
+ chartName:'图表名称',
+ unit:'单位',
+ addModule:'添加组件',
+
+ },
},
el: {
colorpicker: {
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 9ed5f57a5..d5a65b0e3 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -932,7 +932,25 @@ const en = {
name: 'Name',//'名称'
type: 'Type',//'类型'
description: 'Description'//'描述'
- }
+ },
+ topology:{
+ line:'Line',
+ module:'Module element',
+ add:'Add',
+ selTwoNode:'Please select two module',
+ save:'save',
+ cancel:'cancel',
+ addLine:'Add Line',
+ lineName:'Line Name',
+ width:'width',
+ option:'Option',
+ arrows:'Arrows',
+ color:'Color',
+ chartName:'Name',
+ unit:'Unit',
+ addModule:'Add Module',
+
+ },
},
...enLocale
}
diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index f752328c3..6770f0761 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -11,17 +11,17 @@
-
Add Line
+ {{$t('project.topology.addLine')}}
-
+
- Option
-
+ {{$t('project.topology.option')}}
+
@@ -41,7 +41,7 @@
-
+

@@ -55,7 +55,7 @@

-
+
{{form.color}}
@@ -78,7 +78,7 @@
- Name
+ {{$t('project.topology.chartName')}}
@@ -88,7 +88,7 @@
- Unit
+ {{$t('project.topology.unit')}}
{
- console.log(this.$refs['promql-'+(index)],'promql-'+( index));
- console.log(this.expressions[index]);
this.$refs['promql-'+(index)][0].metricChange(this.expressions[index]);
})
}
@@ -250,7 +246,6 @@
roundness:(Math.random()*8 +1)/10 ,//获取0.1-0.9之间的随机数
type:'curvedCW',
};
- console.log(this.expressions);
model.expressions=[];
this.promqlKeys.forEach((item,index)=>{
model.expressions.push({
@@ -260,7 +255,6 @@
"legend": this.legends[index],
})
});
- console.log(model);
this.$emit('addLine',model);
}
});
diff --git a/nezha-fronted/src/components/common/project/addNode.vue b/nezha-fronted/src/components/common/project/addNode.vue
index d8aca88a5..823df745b 100644
--- a/nezha-fronted/src/components/common/project/addNode.vue
+++ b/nezha-fronted/src/components/common/project/addNode.vue
@@ -67,7 +67,7 @@
- Name
+ {{$t('project.topology.chartName')}}
@@ -77,7 +77,7 @@
- Unit
+ {{$t('project.topology.unit')}}
item.id===n)
}
},
diff --git a/nezha-fronted/src/components/common/project/popData/Info.vue b/nezha-fronted/src/components/common/project/popData/Info.vue
index 5cca222a2..902a2a76b 100644
--- a/nezha-fronted/src/components/common/project/popData/Info.vue
+++ b/nezha-fronted/src/components/common/project/popData/Info.vue
@@ -67,7 +67,6 @@
this.$get('/module',{id:this.moduleId}).then(res=>{
this.loading=false;
this.moduleInfo=res.data.list[0];
- console.log(this.moduleInfo,this.projectId);
})
},
methods:{},
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue
index c1698c2f9..acd36a52e 100644
--- a/nezha-fronted/src/components/common/project/topology.vue
+++ b/nezha-fronted/src/components/common/project/topology.vue
@@ -2,21 +2,22 @@
- Module element :
- Add
+ {{$t('project.topology.module')}} :
+ {{$t('project.topology.add')}}
- Line :
- Add
+ {{$t('project.topology.line')}} :
+ {{$t('project.topology.add')}}
- save
- cancel
+ {{$t('project.topology.save')}}
+ {{$t('project.topology.cancel')}}
- Please select two nodes Cancel
+ {{$t('project.topology.selTwoNode')}} {{$t('project.topology.cancel')}}
+
{modelTopMouseDown(e)}" @mouseup="(e)=>modelTopMouseUp(e)">
@@ -57,7 +58,7 @@
@@ -89,7 +90,7 @@
v-if="addNodeShow"
@addModel="addModel"
:nodeData="nodeData"
- @close="addNodeShow=false"
+ @close="closeAddNode"
@del="nodeDel"
:isAdd="isNodeAdd"
:moduleDataS="moduleDataS"
@@ -359,6 +360,7 @@
type: "curvedCW",
},
selfReferenceSize:40,
+ arrowStrikethrough:false,
},
layout:{
randomSeed: 666,
@@ -464,7 +466,6 @@
this.addLineShow=false;
if(!edges){return}
let edgesArray =[...this.edgesArray];
- console.log(edgesArray,edges);
if(!this.isLineAdd){
edges={...edgesArray.find(item=>item.id===edges.id),...edges};
edgesArray=edgesArray.filter(item=>item.id!==edges.id);
@@ -491,6 +492,10 @@
this.NodeArrShow=false;
this.network.unselectAll();
},
+ closeAddNode(){
+ this.addNodeShow=false;
+ this.arrayDiff();
+ },
setNodePosition(selId){ // 移动节点后 设置节点坐标
let position = this.network.getPositions([selId]);
let selItem = this.nodesArray.find((item)=>item.id===selId);
@@ -520,7 +525,6 @@
nodeDel(){
let nodesArray=this.nodesArray.filter((item)=>item.id!==this.selNodeId);
let edgesArray=this.edgesArray.filter((item)=>!(item.from===this.selNodeId || item.to===this.selNodeId));
- console.log(edgesArray,"edgesArray");
this.selNodeId='';
this.$emit('setTopologyData',nodesArray, edgesArray);
this.setNetworkData(nodesArray, edgesArray);
@@ -528,6 +532,7 @@
this.arrayDiff();
},
nodeEdit(){
+ this.moduleDataS.module.push(this.allModuleInfos.module.find(item=>item.id===this.selNodeId));
this.addNodeShow=true;
this.isNodeAdd=false;
},
@@ -642,6 +647,7 @@
this.init('modal');
this.network.on("click", function () {
this_.networkPopClose();
+ this_.popDataShowUpdate();
});
this.network.on("selectNode", function (params) { //选择节点
@@ -671,7 +677,6 @@
this.network.on("selectEdge", function (params) { // 选择边
this_.selNodeId='';
this_.lineData=this_.edgesArray.find((item)=>item.id===params.edges[0]);
- console.log(this_.lineData);
if(this_.lineData.expressions&&this_.lineData.expressions.length){
this_.popDataShowUpdate('total')
}else{
@@ -820,6 +825,8 @@
transform: scale(1.1);
left: 4px;
font-size: 41px;
+ color: #D7FAF1;
+ top: -1px;
}
.network-pop .nz-icon-hexagonBorder:hover .noMove{
transform: scale(1.1);
@@ -944,6 +951,9 @@
position: absolute;
font-size: 48px;
color: rgba(132,213,194,0.5);
+ border-radius: 50%;
+ height: 60px;
+ width: 38px;
}
.nz-icon-model{
color: #23BF9A;
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index 72968d291..050f8ba9c 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -38,8 +38,8 @@
{{projectInfo.title}}
- Id :{{projectInfo.id}}
- Name :{{projectInfo.name}}
+
+ Name :{{projectInfo.name}}
Description :{{projectInfo.remark?projectInfo.remark:'--'}}
@@ -211,10 +211,8 @@
this.$refs['topology'].setData();
},500)
}
- // res.data.topo.viewsCenter?res.data.topo.viewsCenter:
- this.$refs['topology'].viewsCenter={x:0,y:0};
- // res.data.topo.zoom?res.data.topo.zoom:
- this.$refs['topology'].zoom=1;
+ this.$refs['topology'].viewsCenter=res.data.topo.viewsCenter?res.data.topo.viewsCenter:{x:0,y:0};
+ this.$refs['topology'].zoom=res.data.topo.zoom?res.data.topo.zoom:1;
})
},
reload(){
@@ -300,6 +298,9 @@
if(flag){
this.$refs.topology.popDataShowUpdate();
}
+ if(!flag){
+ // this.reload();
+ }
}
},