From 4429f8d7a3b474be0f61275e94dcdff635379db2 Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期四, 13 三月 2025 14:40:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/model/pre/item/MmPredictItemChart.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/views/model/pre/item/MmPredictItemChart.vue b/src/views/model/pre/item/MmPredictItemChart.vue index 4d24c06..a9bc9c1 100644 --- a/src/views/model/pre/item/MmPredictItemChart.vue +++ b/src/views/model/pre/item/MmPredictItemChart.vue @@ -167,6 +167,39 @@ }, }, }) + //累计点 + if(viewData.cumulantRealData) { + legendData.push(key + "累计:" + '真实值') + seriesData.push({ + name: key + "累计:" + '真实值', + type: "line", + data: viewData.cumulantRealData, + showSymbol: false, + smooth: false, + lineStyle: { + normal: { + width: 1, + }, + }, + yAxisIndex: 1 + }) + } + if(viewData.cumulantPreData) { + legendData.push(key + "累计:" + '预测值') + seriesData.push({ + name: key + "累计:" + '预测值', + type: "line", + data: viewData.cumulantPreData, + showSymbol: false, + smooth: false, + lineStyle: { + normal: { + width: 1, + }, + }, + yAxisIndex: 1 + }) + } }) } @@ -190,6 +223,12 @@ }, }, }, + toolbox: { + show: true, + feature: { + saveAsImage: {} + } + }, legend: { show: true, top: 20, @@ -207,9 +246,19 @@ boundaryGap: false, data: data.categories, }, - yAxis: { - type: "value", - }, + yAxis: [ + { + type: "value", + name: '预测值/真实值' + }, + { + type: "value", + splitLine: { + show: false + }, + name: '累计值' + } + ], dataZoom: [ { type: "inside", -- Gitblit v1.9.3