feat:升级echarts到5.0.1
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
"@svgdotjs/svg.panzoom.js": "^2.1.1",
|
"@svgdotjs/svg.panzoom.js": "^2.1.1",
|
||||||
"axios": "^0.19.0",
|
"axios": "^0.19.0",
|
||||||
"cytoscape": "^3.15.2",
|
"cytoscape": "^3.15.2",
|
||||||
"echarts": "^4.7.0",
|
"echarts": "^5.0.1",
|
||||||
"element-ui": "^2.13.0",
|
"element-ui": "^2.13.0",
|
||||||
"file-saver": "^2.0.2",
|
"file-saver": "^2.0.2",
|
||||||
"leaflet": "^1.7.1",
|
"leaflet": "^1.7.1",
|
||||||
|
|||||||
@@ -177,7 +177,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import echarts from 'echarts';
|
import * as echarts from 'echarts';
|
||||||
import bus from '../../libs/bus';
|
import bus from '../../libs/bus';
|
||||||
import loading from "../common/loading";
|
import loading from "../common/loading";
|
||||||
import chartDataFormat from './chartDataFormat'
|
import chartDataFormat from './chartDataFormat'
|
||||||
@@ -786,6 +786,10 @@
|
|||||||
textStyle:{
|
textStyle:{
|
||||||
color:'#000'
|
color:'#000'
|
||||||
},
|
},
|
||||||
|
axisPointer:{
|
||||||
|
snap:false,
|
||||||
|
animation:false,
|
||||||
|
},
|
||||||
extraCssText:'z-index:1000;',
|
extraCssText:'z-index:1000;',
|
||||||
/*enterable:true, 导致tooltip不消失,显示多个tooltip*/
|
/*enterable:true, 导致tooltip不消失,显示多个tooltip*/
|
||||||
position:function(point,params,dom,rect,size){
|
position:function(point,params,dom,rect,size){
|
||||||
@@ -989,6 +993,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
tooltip: {
|
tooltip: {
|
||||||
|
axisPointer:{
|
||||||
|
snap:false,
|
||||||
|
animation:false,
|
||||||
|
},
|
||||||
formatter:function(params){
|
formatter:function(params){
|
||||||
let str = `<div>`;let sum = 0;
|
let str = `<div>`;let sum = 0;
|
||||||
params.forEach((item, i) => {let tip=legend[item.seriesIndex];
|
params.forEach((item, i) => {let tip=legend[item.seriesIndex];
|
||||||
|
|||||||
@@ -181,7 +181,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import echarts from 'echarts';
|
import * as echarts from 'echarts';
|
||||||
import bus from '../../libs/bus';
|
import bus from '../../libs/bus';
|
||||||
import loading from "../common/loading";
|
import loading from "../common/loading";
|
||||||
import chartDataFormat from './chartDataFormat';
|
import chartDataFormat from './chartDataFormat';
|
||||||
@@ -657,6 +657,10 @@
|
|||||||
textStyle:{
|
textStyle:{
|
||||||
color:'#000'
|
color:'#000'
|
||||||
},
|
},
|
||||||
|
axisPointer:{
|
||||||
|
snap:false,
|
||||||
|
animation:false,
|
||||||
|
},
|
||||||
extraCssText:'z-index:1000;',
|
extraCssText:'z-index:1000;',
|
||||||
/*enterable:true, 导致tooltip不消失,显示多个tooltip*/
|
/*enterable:true, 导致tooltip不消失,显示多个tooltip*/
|
||||||
position:function(point,params,dom,rect,size){
|
position:function(point,params,dom,rect,size){
|
||||||
@@ -958,6 +962,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
tooltip: {
|
tooltip: {
|
||||||
|
axisPointer:{
|
||||||
|
snap:false,
|
||||||
|
animation:false,
|
||||||
|
},
|
||||||
formatter:function(params){
|
formatter:function(params){
|
||||||
let str = `<div>`;
|
let str = `<div>`;
|
||||||
let sum = 0;
|
let sum = 0;
|
||||||
@@ -1121,6 +1129,10 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
tooltip: {
|
tooltip: {
|
||||||
|
axisPointer:{
|
||||||
|
snap:false,
|
||||||
|
animation:false,
|
||||||
|
},
|
||||||
formatter:function(params){
|
formatter:function(params){
|
||||||
let str = `<div>`;
|
let str = `<div>`;
|
||||||
let sum = 0;
|
let sum = 0;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import echarts from 'echarts';
|
import * as echarts from 'echarts';
|
||||||
import chartDataFormat from "../../../charts/chartDataFormat";
|
import chartDataFormat from "../../../charts/chartDataFormat";
|
||||||
import loading from "../../../common/loading";
|
import loading from "../../../common/loading";
|
||||||
import chartConfig from './chartConfig'
|
import chartConfig from './chartConfig'
|
||||||
@@ -180,6 +180,7 @@
|
|||||||
if(this.option.series instanceof Array){
|
if(this.option.series instanceof Array){
|
||||||
this.option.series=this.option.series.filter((item,index)=>index<this.dataSize);
|
this.option.series=this.option.series.filter((item,index)=>index<this.dataSize);
|
||||||
}
|
}
|
||||||
|
console.log('option',this.option)
|
||||||
this.chart.setOption(this.option);
|
this.chart.setOption(this.option);
|
||||||
}else{
|
}else{
|
||||||
this.noData=true;
|
this.noData=true;
|
||||||
|
|||||||
@@ -76,7 +76,11 @@
|
|||||||
extraCssText:'z-index:1000;',
|
extraCssText:'z-index:1000;',
|
||||||
backgroundColor:'rgba(221,228,237,1)',
|
backgroundColor:'rgba(221,228,237,1)',
|
||||||
borderColor:'rgba(221,228,237,1)',
|
borderColor:'rgba(221,228,237,1)',
|
||||||
textStyle:{color: "#000"}
|
textStyle:{color: "#000"},
|
||||||
|
axisPointer:{
|
||||||
|
snap:false,
|
||||||
|
animation:false,
|
||||||
|
},
|
||||||
// formatter:null,
|
// formatter:null,
|
||||||
// position:null,
|
// position:null,
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user