From 8bb7160c9c4fd7ce5893ee673647b13cc35410ae Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 03 三月 2025 17:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/MmPredictItemChart.vue | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/views/model/pre/item/MmPredictItemChart.vue b/src/views/model/pre/item/MmPredictItemChart.vue
index 4d24c06..824de21 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
+ })
+ }
})
}
@@ -207,9 +240,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