diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 8f2b955fc..4ebd6f629 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -146,7 +146,12 @@
- {{$t('project.topology.level')}} + {{$t('project.topology.level')}} + + + + + {{$t('project.topology.color')}} {{$t('project.topology.value')}} {{$t('project.topology.animation')}} @@ -154,7 +159,14 @@ - {{item.level}} + + + {{index===0?selection.pen.data.valueMapping.length-1:(item.level-1)}} + + + {{item.level}} + +
@@ -190,14 +202,14 @@ base - > - + > + + base @@ -867,7 +879,7 @@
left - center + center right
@@ -1175,11 +1187,6 @@ name:'', bkColor:'#FFFFFF', bkImage:'', - grid:false, - gridSize:'', - gridColor:undefined, - rule:false, - ruleColor:undefined, lineName:'curve', lineWidth:1, fromArrow:'', @@ -1573,6 +1580,7 @@ } }); getTopology(this.index).render(); + this.$emit('changeProjectTitle') }, colorRGBtoHex(color){//获取颜色16进制数 if(!color){ @@ -1630,21 +1638,61 @@ } }, valueMappingAdd(){ - this.selection.pen.data.valueMapping.push({ - color:{ - line:'#000000', - fill:'#ffffff', - text:'#000000', - }, - showColor:undefined, - animateType:this.selection.pen.type?1:'upDown', - value:0, - level:this.selection.pen.data.valueMapping.length, - showType:'fill',//bac text border - }); + if(this.selection.pen.data.valueMappingSort==='desc'){ + this.selection.pen.data.valueMapping.push({ + color:{ + line:'#000000', + fill:'#ffffff', + text:'#000000', + }, + showColor:undefined, + animateType:this.selection.pen.type?1:'upDown', + value:0, + level:1, + showType:'fill',//bac text border + }); + this.selection.pen.data.valueMapping.forEach((item,index)=>{ + if(index===0){ + return + } + item.level=this.selection.pen.data.valueMapping.length-index; + }) + }else{ + this.selection.pen.data.valueMapping.push({ + color:{ + line:'#000000', + fill:'#ffffff', + text:'#000000', + }, + showColor:undefined, + animateType:this.selection.pen.type?1:'upDown', + value:0, + level:this.selection.pen.data.valueMapping.length, + showType:'fill',//bac text border + }); + } }, valueMappingValueChange(index,row){ + }, + changeValueMappingSort(){ + if(this.selection.pen.data.valueMappingSort==='desc'){ + this.selection.pen.data.valueMappingSort='asc'; + let arr=JSON.parse(JSON.stringify(this.selection.pen.data.valueMapping)); + let a=arr.splice(0,1); + arr.reverse(); + arr.unshift(a[0]); + this.selection.pen.data.valueMapping=arr; + } else{ + this.selection.pen.data.valueMappingSort='desc'; + let arr=JSON.parse(JSON.stringify(this.selection.pen.data.valueMapping)); + let a=arr.splice(0,1); + arr.reverse(); + arr.unshift(a[0]); + console.log(arr); + this.selection.pen.data.valueMapping=arr; + console.log('aaa') + } }, valueMappingDel(index,row){ this.selection.pen.data.valueMapping.splice(index,1); @@ -1927,6 +1975,15 @@ padding: 5px 5px; height: 42px; line-height: 32px; + /deep/ .el-input-group__prepend{ + padding: 0 10px; + } + .is-arrow-active{ + color: #FA901C; + } + .nz-icon.nz-icon-arrow-up1{ + margin-right: -15px; + } } } .value-mapping-add{ diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 455560c43..3e9377ae9 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -5,7 +5,7 @@