From b451bcdf065ddfdd5c46dce49e19707870cb4fa6 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 16 四月 2025 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/analysis/index.vue | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/views/model/pre/analysis/index.vue b/src/views/model/pre/analysis/index.vue
index 7988ba9..8425969 100644
--- a/src/views/model/pre/analysis/index.vue
+++ b/src/views/model/pre/analysis/index.vue
@@ -179,7 +179,7 @@
</el-form>
<el-form :inline="true" :model="formData" label-width="100px">
<el-row>
- <el-col :span="16">
+ <el-col :span="18">
<el-form-item label="数据类型">
<el-checkbox-group v-model="formData.chartCheck" @change="changeChartCheck">
<el-checkbox v-for="item in formData.chartOptions" :label="item"
@@ -206,7 +206,7 @@
<h3 class="chart-foot-title">预警信息</h3>
<div class="chart-foot-table">
<el-table :data="alarmList" style="width: 100%" v-loading="loadingAlarm" height="100px">
- <el-table-column prop="content" header-align="center" align="left" label="消息内容" min-width="200" />
+ <el-table-column prop="content" header-align="center" align="left" label="消息内容" min-width="240" />
<el-table-column prop="alarmType" label="预警类型" header-align="center" align="left" min-width="150"/>
<el-table-column prop="alarmTime" label="预警时间" header-align="center" align="left" min-width="150"/>
</el-table>
@@ -280,7 +280,7 @@
currentStamp60: '',
predictStamp: '',
chartCheck: ['T+L', '真实值'],
- chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值', '预测累计', '真实累计'],
+ chartOptions: ['T+N', 'T+L','T+L(未调整)', '当时', '真实值', '调整值', '预测累计', '真实累计'],
checkedItemData: [],
backItem: '',
backValue: 0,
@@ -526,6 +526,23 @@
seriesData.push({
name: legendName,
data: dataView.preDataL || [],
+ type: 'line',
+ showSymbol: false,
+ connectNulls: true,
+ yAxisIndex: yAxisIndex,
+ smooth: false,
+ lineStyle: {
+ width: 2
+ }
+ });
+ }
+ if (chartCheckArray.indexOf('T+L(未调整)') !== -1) {
+ let legendName = dataView.resultName + '(T+L(未调整))';
+ legendData.push(legendName);
+ seriesData.push({
+ name: legendName,
+ data: dataView.preDataLOriginal
+ || [],
type: 'line',
showSymbol: false,
connectNulls: true,
@@ -921,7 +938,7 @@
currentStamp60: '',
predictStamp: '',
chartCheck: ['T+L', '真实值'],
- chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值', '预测累计', '真实累计'],
+ chartOptions: ['T+N', 'T+L','T+L(未调整)', '当时', '真实值', '调整值', '预测累计', '真实累计'],
checkedItemData: [],
backItem: '',
backValue: 0,
--
Gitblit v1.9.3