diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index c412211e0..c171256ba 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -34,13 +34,7 @@ } }, created() { - this.option=chartConfig.getOption(this.chartType); - this.$set(this.option,'series',this.series); - if(this.chartType == 'line'){ - this.$set(this.option.tooltip,'formatter',this.tooltipFormatter); - this.$set(this.option.tooltip,'position',this.tooltipPosition); - this.$set(this.option.yAxis,'formatter',this.yAxisFormatter); - } + }, methods:{ tooltipPosition:function(point,params,dom,rect,size){ @@ -108,15 +102,22 @@ return unit.compute(value,index); }, setSeries:function(series){ - this.option.series=series; if(!this.chart){ this.chart=echarts.init(document.getElementById(this.chartId)); } + this.series=series; if(this.chartType == 'map'){ - console.log(json) - console.log(this.option) echarts.registerMap('map',json); + chartConfig.setMap('map'); } + this.option=chartConfig.getOption(this.chartType); + this.$set(this.option,'series',this.series); + if(this.chartType == 'line'){ + this.$set(this.option.tooltip,'formatter',this.tooltipFormatter); + this.$set(this.option.tooltip,'position',this.tooltipPosition); + this.$set(this.option.yAxis,'formatter',this.yAxisFormatter); + } + this.chart.clear(); this.chart.setOption(this.option) }, diff --git a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue index 5ad821d49..9e38c02bc 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue @@ -1,6 +1,6 @@ diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue index 7ab90ffa1..d1eb59687 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue @@ -743,34 +743,25 @@ queryDataCenterMapData:function(){ this.dataCenterMapSeries=[{ name: 'DataCenter', - type: 'map', - map:'map', - roam:true, + type: 'scatter', + coordinateSystem: 'geo', label: { - normal: { - show: true - }, - emphasis: { + formatter: '{b}', + position: 'right', + show: false + }, + itemStyle: { + color: 'grey' + }, + emphasis: { + label: { show: true } }, - layoutCenter: ['50%', '50%'], //属性定义地图中心在屏幕中的位置,一般结合layoutSize 定义地图的大小 - layoutSize:500, - itemStyle:{ - normal:{label:{show:true}}, - emphasis:{label:{show:true}} - }, data:[ - {name:'Alabama', value: 40000.34,}, - {name:'Alaska', value: 38000}, - {name:'Arizona', value: 18000}, - {name:'Arkansas', value: 15092}, - {name:'California', value: 28000}, - {name:'Colorado', value: 12000}, - {name:'Connecticut', value: 32000}, - {name:'Delaware', value: 5100}, - {name:'District of Columbia', value: 2200}, - {name:'Florida', value: 4918} + {name:'Alabama', value: [-85.058981, 32.13674,40000.34]}, + {name:'xxx', value: [-71.799309, 41.414677,38000]}, + {name:'Arizona', value:[-114.470151, 32.843265,18000]}, ] }] this.$refs.dataCenterMap.setSeries(this.dataCenterMapSeries);