From e629a9105b1f8c9920d976a93139dda0150c79a8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 20 一月 2025 18:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/analysis/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/model/pre/analysis/index.vue b/src/views/model/pre/analysis/index.vue
index b0939c3..87ba5d9 100644
--- a/src/views/model/pre/analysis/index.vue
+++ b/src/views/model/pre/analysis/index.vue
@@ -223,7 +223,7 @@
queryStep: 2,
isMultipleYRadio: '单坐标轴',
isMultipleY: false,
- predictFreq: 3,
+ predictFreq: 2,
})
const calRateFormRef = ref()
const calRateForm = ref({
@@ -361,7 +361,7 @@
})
offset = offset + 40
if (chartCheckArray.indexOf('真实值') !== -1) {
- let legendName = dataView.resultstr + '(真实)';
+ let legendName = dataView.resultName + '(真实)';
legendData.push(legendName);
seriesData.push({
name: legendName,
@@ -376,7 +376,7 @@
});
}
if (chartCheckArray.indexOf('T+N') !== -1) {
- let legendName = dataView.resultstr + '(T+N)';
+ let legendName = dataView.resultName + '(T+N)';
seriesData.push({
name: legendName,
data: dataView.preDataN || [],
@@ -390,7 +390,7 @@
});
}
if (chartCheckArray.indexOf('T+L') !== -1) {
- let legendName = dataView.resultstr + '(T+L)';
+ let legendName = dataView.resultName + '(T+L)';
legendData.push(legendName);
seriesData.push({
name: legendName,
@@ -406,7 +406,7 @@
});
}
if (chartCheckArray.indexOf('当时') !== -1) {
- let legendName = dataView.resultstr + '(当时)';
+ let legendName = dataView.resultName + '(当时)';
legendData.push(legendName);
seriesData.push({
name: legendName,
@@ -421,7 +421,7 @@
});
}
if (chartCheckArray.indexOf('调整值') !== -1) {
- let legendName = dataView.resultstr + '(调整值)';
+ let legendName = dataView.resultName + '(调整值)';
legendData.push(legendName);
seriesData.push({
name: legendName,
--
Gitblit v1.9.3