diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue index 44ea75e43..f4eae0f6f 100644 --- a/nezha-fronted/src/components/common/project/addLine.vue +++ b/nezha-fronted/src/components/common/project/addLine.vue @@ -37,6 +37,16 @@ + + +
+ {{form.dashes}} +
+ + + +
+
@@ -213,6 +223,7 @@ width:n.width, lineName:n.label, name:[], + dashes:!n.dashes?n.dashes:JSON.stringify(n.dashes), }; if( n.expressions){ n.expressions.forEach((item,index)=>{ @@ -241,6 +252,7 @@ type:'', roundness:'', name:[], + dashes:'' }, predefineColors: [ '#ff4500', @@ -259,6 +271,7 @@ elementIds:[], legends:[], widthOption:['1','2','3','4'], + dashesOption:[false,'[3,3]','[9,9]','[15,15]','[21,21]'], unit:[], rules:{ // arrows: [ @@ -289,6 +302,7 @@ roundness:(Math.random()*8 +1)/10 ,//获取0.1-0.9之间的随机数 type:'curvedCW', }; + model.dashes=!model.dashes?model.dashes:JSON.parse(model.dashes); model.expressions=[]; this.promqlKeys.forEach((item,index)=>{ model.expressions.push({ diff --git a/nezha-fronted/src/components/common/project/image/LRArrow.png b/nezha-fronted/src/components/common/project/image/LRArrow.png deleted file mode 100644 index ea3646f28..000000000 Binary files a/nezha-fronted/src/components/common/project/image/LRArrow.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/a.png b/nezha-fronted/src/components/common/project/image/a.png deleted file mode 100644 index d6afeee61..000000000 Binary files a/nezha-fronted/src/components/common/project/image/a.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/b.png b/nezha-fronted/src/components/common/project/image/b.png deleted file mode 100644 index df64d235f..000000000 Binary files a/nezha-fronted/src/components/common/project/image/b.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/c.png b/nezha-fronted/src/components/common/project/image/c.png deleted file mode 100644 index 45912e1d3..000000000 Binary files a/nezha-fronted/src/components/common/project/image/c.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/d.png b/nezha-fronted/src/components/common/project/image/d.png deleted file mode 100644 index 6f0354497..000000000 Binary files a/nezha-fronted/src/components/common/project/image/d.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/dashed0.png b/nezha-fronted/src/components/common/project/image/dashed0.png new file mode 100644 index 000000000..b40b70cf8 Binary files /dev/null and b/nezha-fronted/src/components/common/project/image/dashed0.png differ diff --git a/nezha-fronted/src/components/common/project/image/dashed1.png b/nezha-fronted/src/components/common/project/image/dashed1.png new file mode 100644 index 000000000..cf6dfb422 Binary files /dev/null and b/nezha-fronted/src/components/common/project/image/dashed1.png differ diff --git a/nezha-fronted/src/components/common/project/image/dashed2.png b/nezha-fronted/src/components/common/project/image/dashed2.png new file mode 100644 index 000000000..8eecde464 Binary files /dev/null and b/nezha-fronted/src/components/common/project/image/dashed2.png differ diff --git a/nezha-fronted/src/components/common/project/image/dashed3.png b/nezha-fronted/src/components/common/project/image/dashed3.png new file mode 100644 index 000000000..016cd9f36 Binary files /dev/null and b/nezha-fronted/src/components/common/project/image/dashed3.png differ diff --git a/nezha-fronted/src/components/common/project/image/dashed4.png b/nezha-fronted/src/components/common/project/image/dashed4.png new file mode 100644 index 000000000..605ab7b01 Binary files /dev/null and b/nezha-fronted/src/components/common/project/image/dashed4.png differ diff --git a/nezha-fronted/src/components/common/project/image/e.png b/nezha-fronted/src/components/common/project/image/e.png deleted file mode 100644 index 3019f7707..000000000 Binary files a/nezha-fronted/src/components/common/project/image/e.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/f.png b/nezha-fronted/src/components/common/project/image/f.png deleted file mode 100644 index b1c49b15a..000000000 Binary files a/nezha-fronted/src/components/common/project/image/f.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/leftArrow.png b/nezha-fronted/src/components/common/project/image/leftArrow.png deleted file mode 100644 index fb49a85a6..000000000 Binary files a/nezha-fronted/src/components/common/project/image/leftArrow.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/noArrow.png b/nezha-fronted/src/components/common/project/image/noArrow.png deleted file mode 100644 index 53a284c8c..000000000 Binary files a/nezha-fronted/src/components/common/project/image/noArrow.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/image/rightArrow.png b/nezha-fronted/src/components/common/project/image/rightArrow.png deleted file mode 100644 index 4b4a4d617..000000000 Binary files a/nezha-fronted/src/components/common/project/image/rightArrow.png and /dev/null differ diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue index a12087676..bb86702d6 100644 --- a/nezha-fronted/src/components/common/project/topology.vue +++ b/nezha-fronted/src/components/common/project/topology.vue @@ -170,7 +170,7 @@ color:'#1e90ff', lineId:'', width:'1', - dashed:'[5,5]', + dashes:false, id:'', }; this.addLineShow=true; @@ -229,6 +229,7 @@ color:'#1e90ff', lineId:'', id:'', + dashes:[], }, hoverEdge:false, isLineAdd:true, @@ -321,6 +322,7 @@ "target": item.to, "smooth": item.smooth, "expressions": item.expressions, + "dashes":item.dashes, }; arr1.push(obj) }); @@ -488,7 +490,6 @@ }else{ edges.from=this.NodeArr[0]; edges.to=this.NodeArr[1]; - edges.dashes=[15,15]; } edgesArray.push(edges); this.$emit("setTopologyData",this.nodesArray,edgesArray); diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue index 5320e425e..94a29eea1 100644 --- a/nezha-fronted/src/components/common/project/visNetwork.vue +++ b/nezha-fronted/src/components/common/project/visNetwork.vue @@ -265,7 +265,6 @@ let arr1=[]; if(!arr){return arr1} arr.forEach((item)=>{ - item.dashes=[5,5]; item.from=item.source; item.to=item.target; item.label=item.name;