diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 7fd4894a6..d7d1cf6a2 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -1,11 +1,12 @@ diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index c13fb5ba1..394e6b374 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -143,7 +143,7 @@ @@ -1028,8 +1028,25 @@ }, // 设置数据 setTableData(seriesItem) { + console.log('set table data',this.chart) this.unit = chartDataFormat.getUnit(this.chart.unit); + seriesItem=seriesItem.map(item=>{ + if(this.chart.param.valueMapping && this.chart.param.valueMapping.type){ + let type=this.chart.param.valueMapping.type; + let mappings=this.chart.param.valueMapping.mapping?this.chart.param.valueMapping.mapping:[]; + let value = item.value; + let mapping; + if(type == 'value'){ + mapping=mappings.find(t=>{return t.value == value}) + }else{ + mapping=mappings.find(t=>{return t.from <= value&& t.to >= value}); + } + item.value = mapping?mapping.text:this.unit.compute(value,null,2); + console.log('value',value,'mapping',mapping) + } + return item; + }) this.storedScreanTableData=seriesItem; this.storedScreanTableData=Object.assign([],this.storedScreanTableData.reverse()); this.screenPageObj.total=this.storedScreanTableData.length; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 35e5d6c59..56a30e9fe 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -37,7 +37,7 @@ - {{chartData.title}} + {{chartData.title}}-[{{chartData.id}}]