diff --git a/src/views/Statistics/MentoringAbility.vue b/src/views/Statistics/MentoringAbility.vue index 8e1e3d1..c0970a8 100644 --- a/src/views/Statistics/MentoringAbility.vue +++ b/src/views/Statistics/MentoringAbility.vue @@ -851,9 +851,6 @@ export default { var myChart = echarts.init(chartDom); var option; option = { - tooltip: { - trigger: "axis", - }, legend: { data: [this.consultantname,this.Packname], top: "6", @@ -881,32 +878,6 @@ export default { }, }, }, - yAxis: { - type: "value", - splitNumber: 4, - axisLabel: { - //重点在这一块,其余可以忽略 - textStyle: { - color: "#212121", //更改坐标轴文字颜色 - }, - }, - axisLine: { - lineStyle: { - ype: "solid", - color: "#DDE1EE", //x线的颜色 - width: "1", //坐标线的宽度 - }, - }, - splitLine: { - lineStyle: { - type: "dashed", // y轴分割线类型 - }, - }, - axisTick: { - //y轴刻度线 - show: false, - }, - }, series: [ { name: this.consultantname, @@ -922,6 +893,73 @@ export default { } ], }; + if(data1=='data3'){ + option.tooltip={ + trigger: 'axis', + formatter: function (params) { + let src= '

'+params[0].seriesName+':'+params[0].data+'%'+'

'+'

'+params[1].seriesName+':'+ params[1].data+'%'+'

'; + return src + } + }; + option.yAxis={ + type: 'value', + splitNumber:5, + max:100, + min:0, + axisLabel: { //重点在这一块,其余可以忽略 + textStyle: { + color: '#212121', //更改坐标轴文字颜色 + } + }, + axisLine: { + lineStyle: { + ype: 'solid', + color: '#DDE1EE',//x线的颜色 + width:'1'//坐标线的宽度 + } + }, + splitLine: { + lineStyle: { + type: 'dashed' // y轴分割线类型 + } + }, + axisTick: { //y轴刻度线 + show: false + }, + } + }else{ + option.tooltip={ + trigger: 'axis', + } + option.yAxis={ + type: 'value', + splitNumber:5, + min:0, + minInterval: 1, + axisLabel: { //重点在这一块,其余可以忽略 + textStyle: { + color: '#212121', //更改坐标轴文字颜色 + } + }, + axisLine: { + lineStyle: { + ype: 'solid', + color: '#DDE1EE',//x线的颜色 + width:'1'//坐标线的宽度 + } + }, + splitLine: { + lineStyle: { + type: 'dashed' // y轴分割线类型 + } + }, + axisTick: { //y轴刻度线 + show: false + }, + }; + } + + option && myChart.setOption(option); window.addEventListener("resize", () => { myChart.resize(); diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue index 9e5fa6f..d9d565d 100644 --- a/src/views/Statistics/TrendAnalysis.vue +++ b/src/views/Statistics/TrendAnalysis.vue @@ -798,6 +798,7 @@ export default { option = { tooltip: { trigger: "axis", + formatter: '{b0}: {c0}'+'%' }, legend: { data: ["起始时间"], @@ -828,7 +829,9 @@ export default { }, yAxis: { type: "value", - splitNumber: 4, + splitNumber:5, + max:100, + min:0, axisLabel: { //重点在这一块,其余可以忽略 textStyle: { @@ -876,6 +879,10 @@ export default { option = { tooltip: { trigger: "axis", + formatter: function (params) { + let src= '

'+params[0].seriesName+':'+params[0].data+'%'+'

'+'

'+params[1].seriesName+':'+ params[1].data+'%'+'

'; + return src + } }, legend: { data: ["起始时间","对比时间"], @@ -906,7 +913,9 @@ export default { }, yAxis: { type: "value", - splitNumber: 4, + splitNumber:5, + max:100, + min:0, axisLabel: { //重点在这一块,其余可以忽略 textStyle: { diff --git a/src/views/Statistics/trend.vue b/src/views/Statistics/trend.vue index 7bbf888..f8333e8 100644 --- a/src/views/Statistics/trend.vue +++ b/src/views/Statistics/trend.vue @@ -689,15 +689,15 @@ export default { }, //卡片下折线图 SwitchCARDS(arr, str, timeDate, Strname) { - // console.log(arr,str,timeDate,Strname); + echarts.init(document.getElementById(str)).dispose(); // 销毁实例 var chartDom = document.getElementById(str); var myChart = echarts.init(chartDom); var option; option = { - tooltip: { - trigger: "axis", - }, + // tooltip: { + // trigger: "axis", + // }, legend: { data: Strname, bottom: "10", @@ -725,7 +725,57 @@ export default { }, }, }, - yAxis: { + + series: arr, + }; + if(this.secindex=='fraction'){ + if(this.selectTime1){ + option.tooltip={ + trigger: 'axis', + formatter: function (params) { + let src= '

'+params[0].seriesName+':'+params[0].data+'%'+'

'+'

'+params[1].seriesName+':'+ params[1].data+'%'+'

'; + return src + } + }; + }else{ + option.tooltip={ + trigger: 'axis', + formatter: '{b0}:{c0}'+'%' + } + } + + option.yAxis={ + type: 'value', + splitNumber:5, + max:100, + min:0, + axisLabel: { //重点在这一块,其余可以忽略 + textStyle: { + color: '#212121', //更改坐标轴文字颜色 + } + }, + axisLine: { + lineStyle: { + ype: 'solid', + color: '#DDE1EE',//x线的颜色 + width:'1'//坐标线的宽度 + } + }, + splitLine: { + lineStyle: { + type: 'dashed' // y轴分割线类型 + } + }, + axisTick: { //y轴刻度线 + show: false + }, + } + + }else{ + option.tooltip={ + trigger: "axis", + } + option.yAxis={ type: "value", splitNumber: 4, axisLabel: { @@ -750,9 +800,11 @@ export default { //y轴刻度线 show: false, }, - }, - series: arr, - }; + } + } + + + option && myChart.setOption(option); window.addEventListener("resize", () => { myChart.resize(); diff --git a/vue.config.js b/vue.config.js index db6248b..f361a46 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,8 +3,8 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -const url = 'http://39.97.167.65:9999' //测试 -// const url = 'http://192.168.31.169:9999' //长龙 +// const url = 'http://39.97.167.65:9999' //测试 +const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 // const url = 'http://nitu5e.natappfree.cc' //王笑