From 62c452107417690bc1f48fe55a4cc222e9900b13 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 10 四月 2025 14:58:17 +0800
Subject: [PATCH] 数据分析 添加T+L(未调整) 自动调整配置
---
src/views/model/pre/analysis/index.vue | 102 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/src/views/model/pre/analysis/index.vue b/src/views/model/pre/analysis/index.vue
index 5c75f02..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"
@@ -201,6 +201,46 @@
</el-row>
</el-form>
<div ref="dataAnalysisChart" style="height: 500px;"></div>
+ <div class="chart-foot">
+ <div class="chart-foot-content">
+ <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="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>
+ </div>
+ </div>
+ <div class="chart-foot-content">
+ <h3 class="chart-foot-title">调度建议</h3>
+ <div class="chart-foot-table">
+ <el-table :data="suggestList" style="width: 100%" v-loading="loadingAdjust" height="100px">
+ <el-table-column
+ prop="scheduleTime"
+ label="调度时间"
+ header-align="center"
+ align="left"
+ min-width="160"
+ />
+ <el-table-column
+ prop="content"
+ label="内容"
+ min-width="300"
+ header-align="center" align="left"
+ />
+ <el-table-column
+ prop="adjustValue"
+ label="调整值"
+ header-align="center"
+ align="center"
+ min-width="100"
+ />
+ </el-table>
+ </div>
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -211,6 +251,8 @@
<script lang="ts" setup>
import {getYMDHMS} from "@/utils/dateUtil"
import * as McsApi from '@/api/model/mcs'
+import * as AlarmMessageApi from '@/api/model/pre/alarm/message'
+import * as ScheSuggestApi from '@/api/model/sche/suggest'
import * as echarts from "echarts";
import {Search, DArrowLeft, DArrowRight, VideoPlay, VideoPause, CaretLeft, CaretRight} from '@element-plus/icons-vue'
@@ -238,7 +280,7 @@
currentStamp60: '',
predictStamp: '',
chartCheck: ['T+L', '真实值'],
- chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值', '预测累计', '真实累计'],
+ chartOptions: ['T+N', 'T+L','T+L(未调整)', '当时', '真实值', '调整值', '预测累计', '真实累计'],
checkedItemData: [],
backItem: '',
backValue: 0,
@@ -278,6 +320,10 @@
const timer = ref()
let myChart = null;
const isPlay = ref(false)
+const alarmList = ref([])
+const suggestList = ref([])
+const loadingAlarm = ref(false)
+const loadingAdjust = ref(false)
const formRules = reactive({
calItem: [{required: true, message: '预测项不能为空', trigger: 'blur'}],
@@ -317,10 +363,24 @@
startTime: formData.value.startTime,
endTime: formData.value.endTime
})
+
const data = await McsApi.getPreDataCharts(params)
formData.value.predictTime = data.predictTime;
formData.value.startTime = data.startTime
formData.value.endTime = data.endTime
+
+ const paramsAlarm = reactive({
+ outIds: outIds,
+ predictTime: formData.value.predictTime
+ })
+
+ loadingAlarm.value = true
+ alarmList.value = await AlarmMessageApi.getListByOut(paramsAlarm)
+ loadingAlarm.value = false
+
+ loadingAdjust.value = true
+ suggestList.value = await ScheSuggestApi.getListByOut(paramsAlarm)
+ loadingAdjust.value = false
let xAxisData = data.categories;
let defaultYAxis = [
@@ -466,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,
@@ -861,7 +938,7 @@
currentStamp60: '',
predictStamp: '',
chartCheck: ['T+L', '真实值'],
- chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值', '预测累计', '真实累计'],
+ chartOptions: ['T+N', 'T+L','T+L(未调整)', '当时', '真实值', '调整值', '预测累计', '真实累计'],
checkedItemData: [],
backItem: '',
backValue: 0,
@@ -894,6 +971,23 @@
}
</script>
<style scoped>
+.chart-foot-table {
+ border: 1px solid #bababa;
+}
+.chart-foot-title {
+ font-size: 14px;
+}
+.chart-foot-content {
+ height: 100%;
+ width: 50%;
+ padding: 5px;
+}
+.chart-foot {
+ height: 120px;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+}
.el-form-item {
margin-bottom: 0 !important;
}
@@ -925,7 +1019,7 @@
.his-body {
width: 100%;
- height: calc(calc(100vh - 68px - 38px - 160px));
+ height: calc(calc(100vh - 68px - 38px - 60px));
display: flex;
flex-direction: row;
justify-content: flex-start;
--
Gitblit v1.9.3