From 73e0b3791990bd60c06c2c0388aae9f9faf538a6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 25 三月 2026 09:16:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/show-demo' into show_demo
---
src/views/dataAnalysis/components/DataReLineChart.vue | 124 ++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 58 deletions(-)
diff --git a/src/views/dataAnalysis/components/DataReLineChart.vue b/src/views/dataAnalysis/components/DataReLineChart.vue
index 1c698ba..857fd8d 100644
--- a/src/views/dataAnalysis/components/DataReLineChart.vue
+++ b/src/views/dataAnalysis/components/DataReLineChart.vue
@@ -247,15 +247,23 @@
shadowBlur: 10,
formatter: (params) => {
let strName1 = params[0].name
- let value1 = params[0].value
- let value2 = params[1] ? params[1].value : '鏈紑鍚�'
+ let value1 = params[0] ? params[0].value : 0
+ let value2 = params[1] ? params[1].value : 0
+ let value3 = params[2] ? params[2].value : 0
+ let value4 = params[3] ? params[3].value : 0
return `<div style="color:#fff;font-size:16px;">${strName1}</div>
<div><span style="color:#fff;display: inline-block;width: 86px;">${
this.chartData.barName
}</span><span style="color:#5DB6FB">${value1}
</span></div><div><span style="color:#fff;display: inline-block;width: 86px;">${
this.chartData.lineName
- }</span><span style="color:#5DB6FB">${value2}${this.showpercent ? '%' : ''}`
+ }</span><span style="color:#5DB6FB">${value2}
+ </span></div><div><span style="color:#fff;display: inline-block;width: 86px;">${
+ this.chartData.barName2
+ }</span><span style="color:#FF6B6B">${value3}
+ </span></div><div><span style="color:#fff;display: inline-block;width: 86px;">${
+ this.chartData.lineName2
+ }</span><span style="color:#FFD93D">${value4}</span>`
},
textStyle: {
rich: {
@@ -312,32 +320,6 @@
show: false,
},
},
- {
- type: 'value',
- nameTextStyle: {
- color: 'rgba(185, 185, 185, 1)',
- },
- position: 'right',
- axisLine: {
- show: false,
- },
- splitLine: {
- show: false,
- },
- axisTick: {
- show: false,
- },
- axisLabel: {
- show: true,
- formatter: '{value} %', //鍙充晶Y杞存枃瀛楁樉绀�
- formatter: (value, index) => {
- return value + (this.showpercent ? '%' : '')
- },
- textStyle: {
- color: 'rgba(185, 185, 185, 1)',
- },
- },
- },
],
series: [
@@ -364,40 +346,66 @@
{
name: this.chartData.lineName,
- type: 'line',
- // smooth: true,
- yAxisIndex: 1, //浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢�
-
- symbol: 'emptycircle', //鏍囪鐨勫浘褰负瀹炲績鍦�
- symbolSize: 0, //鏍囪鐨勫ぇ灏�
- areaStyle: {
+ type: 'bar',
+ barWidth: '12px',
+ itemStyle: {
normal: {
- color: {
- type: 'linear',
- x: 0,
- y: 0,
- x2: 0,
- y2: 1,
- colorStops: [
- {
- offset: 0,
- color: 'rgba(87, 147, 67, .5)', // 0% 澶勭殑棰滆壊
- },
- {
- offset: 1,
- color: 'rgba(87, 147, 67, 0.1)', // 100% 澶勭殑棰滆壊
- },
- ],
- global: false, // 缂虹渷涓� false
- },
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#16B777',
+ },
+ {
+ offset: 1,
+ color: '#0D6E4A',
+ },
+ ]),
},
},
- itemStyle: {
- color: 'rgba(65, 197, 95, 1)',
- },
-
data: this.chartData.lineData,
},
+
+ {
+ name: this.chartData.barName2,
+ type: 'bar',
+ barWidth: '12px',
+ itemStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#FF6B6B',
+ },
+ {
+ offset: 1,
+ color: '#8B0000',
+ },
+ ]),
+ },
+ },
+ data: this.chartData.barData2,
+ },
+
+ {
+ name: this.chartData.lineName2,
+ type: 'bar',
+ barWidth: '12px',
+ itemStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#FFD93D',
+ },
+ {
+ offset: 1,
+ color: '#B8860B',
+ },
+ ]),
+ },
+ },
+ data: this.chartData.lineData2,
+ },
],
}
option && this.chartEntity.setOption(option, true)
--
Gitblit v1.8.0