From 8d139bf079918171f140a53004ad4221937e3ad0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 21 三月 2025 14:48:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/analysis/index.vue | 543 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 432 insertions(+), 111 deletions(-)
diff --git a/src/views/model/pre/analysis/index.vue b/src/views/model/pre/analysis/index.vue
index de15ab9..7988ba9 100644
--- a/src/views/model/pre/analysis/index.vue
+++ b/src/views/model/pre/analysis/index.vue
@@ -1,23 +1,29 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-his__index">
- <el-form :inline="true" :model="formData" label-width="80px">
+ <el-form :inline="true" :model="formData" label-width="70px">
<el-form-item label="开始时间">
<el-date-picker
v-model="formData.startTime"
type="datetime"
+ format="YYYY-MM-DD HH:mm:00"
+ value-format="YYYY-MM-DD HH:mm:00"
placeholder="选择日期时间"/>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker
v-model="formData.endTime"
type="datetime"
+ format="YYYY-MM-DD HH:mm:00"
+ value-format="YYYY-MM-DD HH:mm:00"
placeholder="选择日期时间"/>
</el-form-item>
<el-form-item label="预测时间">
<el-date-picker
v-model="formData.predictTime"
type="datetime"
+ format="YYYY-MM-DD HH:mm:00"
+ value-format="YYYY-MM-DD HH:mm:00"
placeholder="选择日期时间"/>
</el-form-item>
<el-form-item label="预测频率">
@@ -27,59 +33,75 @@
</el-form-item>
<el-form-item>
<el-button-group>
- <el-button type="primary" plain :icon="ArrowLeft"
- v-loading="loading1" @click="leftSearchDataByRange()"/>
+ <el-button type="primary" plain :icon="DArrowLeft"
+ :loading="loading1" @click="leftSearchDataByRange()"/>
<el-button type="primary" plain :icon="Search"
- v-loading="loading1" @click="getList()">查询
+ :loading="loading1" @click="getList()">查询
</el-button>
- <el-button type="primary" plain :icon="ArrowRight"
- v-loading="loading1" @click="rightSearchDataByRange()"/>
+ <el-button type="primary" plain :icon="DArrowRight"
+ :loading="loading1" @click="rightSearchDataByRange()"/>
+ </el-button-group>
+ </el-form-item>
+ <el-form-item>
+ <el-button-group>
+ <el-button type="primary" plain :icon="CaretLeft"
+ @click="playChart(true)"/>
+ <el-button type="primary" plain :icon="VideoPlay" v-if="!isPlay"
+ @click="playHandle('play')"/>
+ <el-button type="primary" plain :icon="VideoPause" v-if="isPlay"
+ @click="playHandle('pause')"/>
+ <el-button type="primary" plain :icon="CaretRight"
+ @click="playChart(false)"/>
</el-button-group>
</el-form-item>
<div class="his-body">
<div class="his-body-left">
<div class="his-body-tree">
+ <el-input
+ v-model="filterText"
+ class="mb-2"
+ placeholder="Filter"
+ />
<el-tree
:data="treeData"
show-checkbox
node-key="id"
- ref="tree"
+ ref="treeRef"
highlight-current
- :props="defaultProps"
+ :filter-node-method="filterNode"
@check="onCheckTree"/>
</div>
</div>
<div class="his-body-right">
<div class="his-body-chart">
- <el-form :inline="true" :model="calRateForm" :rules="formRules" ref="calRateForm"
+ <el-form :inline="true" :model="calRateForm" :rules="formRules" ref="calRateFormRef"
label-width="108px">
<el-row>
<el-col :span="6">
<el-form-item label="预测项" prop="calItem" style="width: 90%">
- <el-select size="small" v-model="calRateForm.calItem" @change="calItemBaseVale"
+ <el-select size="small" v-model="calRateForm.calItem"
+ @change="calItemBaseVale"
placeholder="请选择">
<el-option
- v-for="item in formData.checkedItemData"
- :key="item.id"
- :label="item.label"
- :value="item.id"/>
+ v-for="itemOut in formData.checkedItemData"
+ :key="itemOut.id"
+ :label="itemOut.label"
+ :value="itemOut.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="精准度偏差" prop="IN_DEVIATION">
<el-input-number size="small" v-model="calRateForm.IN_DEVIATION"
- controls-position="right" :min="1"
- :max="10"/>
+ controls-position="right" :min="0"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="不可信率偏差" prop="OUT_DEVIATION">
<el-input-number size="small" v-model="calRateForm.OUT_DEVIATION"
controls-position="right"
- :min="1"
- :max="20"/>
+ :min="1"/>
</el-form-item>
</el-col>
<el-col :span="4">
@@ -116,6 +138,11 @@
{{ calRateForm.preCumulant }}
</el-form-item>
</el-col>
+ <el-col :span="4">
+ <el-form-item label="平均绝对误差：" label-width="110px">
+ {{ calRateForm.deviation }}
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="4">
@@ -143,11 +170,16 @@
{{ calRateForm.realCumulant }}
</el-form-item>
</el-col>
+ <el-col :span="4">
+ <el-form-item label="累积量平均绝对误差：" label-width="152px">
+ {{ calRateForm.deviationCumulant }}
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<el-form :inline="true" :model="formData" label-width="100px">
<el-row>
- <el-col :span="12">
+ <el-col :span="16">
<el-form-item label="数据类型">
<el-checkbox-group v-model="formData.chartCheck" @change="changeChartCheck">
<el-checkbox v-for="item in formData.chartOptions" :label="item"
@@ -169,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="200" />
+ <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>
@@ -179,10 +251,10 @@
<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 {onMounted, ref} from 'vue';
-import {Search, ArrowLeft, ArrowRight,} from '@element-plus/icons-vue'
-import {getPreDataCharts, getPredictItemTree} from "@/api/model/mcs";
+import {Search, DArrowLeft, DArrowRight, VideoPlay, VideoPause, CaretLeft, CaretRight} from '@element-plus/icons-vue'
defineOptions({name: 'AnalysisformData'})
@@ -208,7 +280,7 @@
currentStamp60: '',
predictStamp: '',
chartCheck: ['T+L', '真实值'],
- chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值'],
+ chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值', '预测累计', '真实累计'],
checkedItemData: [],
backItem: '',
backValue: 0,
@@ -218,12 +290,13 @@
queryStep: 2,
isMultipleYRadio: '单坐标轴',
isMultipleY: false,
- predictFreq: 3,
+ predictFreq: 2,
})
-let calRateForm = ref({
- calItem: '',
- IN_DEVIATION: 0,
- OUT_DEVIATION: 0,
+const calRateFormRef = ref()
+const calRateForm = ref({
+ calItem: undefined,
+ IN_DEVIATION: 10,
+ OUT_DEVIATION: 50,
IN_ACCURACY_RATE: 0,
OUT_ACCURACY_RATE: 0,
itemAvg: 0,
@@ -233,7 +306,9 @@
itemPreMax: 0,
itemPreMin: 0,
preCumulant: 0,
- realCumulant: 0
+ realCumulant: 0,
+ deviation: 0, //平均绝对误差
+ deviationCumulant: 0, //累积量平均绝对误差
})
let itemData = ref({
currentTreeList: [],
@@ -244,6 +319,11 @@
const itemDataObject = ref()
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'}],
@@ -251,8 +331,19 @@
OUT_DEVIATION: [{required: true, message: '不可信率偏差不能为空', trigger: 'blur'}],
})
+// 树形过滤
+const filterText = ref('')
+const treeRef = ref()
+watch(filterText, (val) => {
+ treeRef.value!.filter(val)
+})
+const filterNode = (value: string, data) => {
+ if (!value) return true
+ return data.label.includes(value)
+}
+
/** 查询列表 */
-const getList = async () => {
+const getList = async (isClear = true) => {
loading1.value = true
try {
if (!formData.value.chartCheck) {
@@ -272,12 +363,42 @@
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 = [
+ {
+ type: 'value',
+ name: "累计值",
+ splitLine: {show: false},
+ axisLine: {show: true},
+ position: 'right'
+ },
+ {
+ type: 'value',
+ name: "",
+ splitLine: {show: false},
+ axisLine: {show: true},
+ position: 'left'
+ }
+ ];
let yAxisData = [];
let offset = 0;
let yAxisIndex = 0;
@@ -308,12 +429,27 @@
},
});
itemDataObject.value = {}
+ yAxisData.push({
+ type: 'value',
+ name: "累计值",
+ position: 'right',
+ splitLine: {
+ show: false
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {}
+ },
+ axisLabel: {
+ formatter: '{value}'
+ }
+ })
for (let i = 0; i < data.dataViewList.length; i++) {
let dataView = data.dataViewList[i]
itemDataObject.value[dataView.outId] = dataView;
let maxValue = dataView.maxValue;
let minValue = dataView.minValue;
- yAxisIndex = formData.value.isMultipleY ? i : 0;
+ yAxisIndex = (formData.value.isMultipleY ? i : 0) + 1;
let yMax = maxValue;
if (maxValue < 0) {
maxValue = 1;
@@ -355,7 +491,7 @@
})
offset = offset + 40
if (chartCheckArray.indexOf('真实值') !== -1) {
- let legendName = dataView.resultstr + '(真实)';
+ let legendName = dataView.resultName + '(真实)';
legendData.push(legendName);
seriesData.push({
name: legendName,
@@ -363,28 +499,29 @@
type: 'line',
yAxisIndex: yAxisIndex,
showSymbol: false,
- smooth: true,
+ smooth: false,
lineStyle: {
width: 2
}
});
}
if (chartCheckArray.indexOf('T+N') !== -1) {
- let legendName = dataView.resultstr + '(T+N)';
+ let legendName = dataView.resultName + '(T+N)';
+ legendData.push(legendName);
seriesData.push({
name: legendName,
data: dataView.preDataN || [],
type: 'line',
yAxisIndex: yAxisIndex,
showSymbol: false,
- smooth: true,
+ smooth: false,
lineStyle: {
width: 2
}
});
}
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,
@@ -393,29 +530,29 @@
showSymbol: false,
connectNulls: true,
yAxisIndex: yAxisIndex,
- smooth: true,
+ smooth: false,
lineStyle: {
width: 2
}
});
}
if (chartCheckArray.indexOf('当时') !== -1) {
- let legendName = dataView.resultstr + '(当时)';
+ let legendName = dataView.resultName + '(当时)';
legendData.push(legendName);
seriesData.push({
name: legendName,
data: dataView.curData || [],
type: 'line',
yAxisIndex: yAxisIndex,
- showSymbol: false,
- smooth: true,
+ showSymbol: true,
+ smooth: false,
lineStyle: {
- width: 2
+ width: 3
}
});
}
if (chartCheckArray.indexOf('调整值') !== -1) {
- let legendName = dataView.resultstr + '(调整值)';
+ let legendName = dataView.resultName + '(调整值)';
legendData.push(legendName);
seriesData.push({
name: legendName,
@@ -424,7 +561,51 @@
yAxisIndex: yAxisIndex,
showSymbol: false,
connectNulls: true,
- smooth: true,
+ smooth: false,
+ lineStyle: {
+ width: 2,
+ type: 'dashed'
+ }
+ });
+ }
+
+ if (chartCheckArray.indexOf('预测累计') !== -1) {
+ let legendName = dataView.resultName + '(预测累计)';
+ legendData.push(legendName);
+ let seriesLeiJiData = []
+ if (dataView.cumulantPreData) {
+ seriesLeiJiData = dataView.cumulantPreData
+ }
+ seriesData.push({
+ name: legendName,
+ data: seriesLeiJiData,
+ type: 'line',
+ yAxisIndex: 0,
+ showSymbol: false,
+ connectNulls: true,
+ smooth: false,
+ lineStyle: {
+ width: 2,
+ type: 'dashed'
+ }
+ });
+ }
+
+ if (chartCheckArray.indexOf('真实累计') !== -1) {
+ let legendName = dataView.resultName + '(真实累计)';
+ legendData.push(legendName);
+ let seriesLeiJiData = []
+ if (dataView.cumulantRealData) {
+ seriesLeiJiData = dataView.cumulantRealData
+ }
+ seriesData.push({
+ name: legendName,
+ data: seriesLeiJiData,
+ type: 'line',
+ yAxisIndex: 0,
+ showSymbol: false,
+ connectNulls: true,
+ smooth: false,
lineStyle: {
width: 2,
type: 'dashed'
@@ -442,6 +623,7 @@
}
}
}
+
myChart = echarts.init(dataAnalysisChart.value);
let option = {
title: {
@@ -449,6 +631,12 @@
},
tooltip: {
trigger: 'axis'
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ saveAsImage: {}
+ }
},
legend: {
show: true,
@@ -467,11 +655,7 @@
boundaryGap: false,
data: xAxisData
},
- yAxis: formData.value.isMultipleY ? yAxisData : {
- type: 'value',
- splitLine: {show: false},
- axisLine: {show: true}
- },
+ yAxis: formData.value.isMultipleY ? yAxisData : defaultYAxis,
dataZoom: [
{
type: 'inside',
@@ -485,20 +669,67 @@
],
series: seriesData
}
- myChart.clear()
+ if (isClear) {
+ myChart.clear()
+ }
myChart.setOption(option)
} finally {
loading1.value = false
}
+
+ calItemBaseVale()
}
onMounted(() => {
+ resetForm()
getPreItemTree()
- getList()
})
async function getPreItemTree() {
treeData.value = await McsApi.getPredictItemTree()
+}
+
+function changeChartCheck(value) {
+ getList(true)
+}
+
+function onChangeMultipleY() {
+ getList(true)
+}
+
+function playChart(isBack = false) {
+ let mins = isBack ? formData.value.predictFreq * -1 : formData.value.predictFreq
+ let startTime = formData.value.startTime;
+ let endTime = formData.value.endTime;
+ let predictTime = formData.value.predictTime;
+ if (predictTime) {
+ predictTime = getYMDHMS(new Date(predictTime).getTime() + 1000 * 60 * mins);
+ formData.value.predictTime = predictTime;
+ }
+ if (startTime) {
+ startTime = getYMDHMS(new Date(startTime).getTime() + 1000 * 60 * mins);
+ formData.value.startTime = startTime;
+ }
+ if (endTime) {
+ endTime = getYMDHMS(new Date(endTime).getTime() + 1000 * 60 * mins);
+ formData.value.endTime = endTime;
+ }
+ getList(false);
+}
+
+function playHandle(type) {
+ isPlay.value = 'play' === type
+ let doPlay = setInterval(function () {
+ if (isPlay.value) {
+ playChart()
+ } else {
+ clearInterval(doPlay);
+ }
+ if (new Date().getTime() - new Date(formData.value.predictTime).getTime() < 1000 * 60 ) {
+ isPlay.value = false
+ clearInterval(doPlay);
+ }
+ }, 1000)
}
function leftSearchDataByRange() {
@@ -507,18 +738,18 @@
let endTime = formData.value.endTime;
let predictTime = formData.value.predictTime;
if (predictTime) {
- predictTime = getYMDHMS(new Date(predictTime) - 1000 * 60 * mins);
+ predictTime = getYMDHMS(new Date(predictTime).getTime() - 1000 * 60 * mins);
formData.value.predictTime = predictTime;
}
if (startTime) {
- startTime = getYMDHMS(new Date(startTime) - 1000 * 60 * mins);
+ startTime = getYMDHMS(new Date(startTime).getTime() - 1000 * 60 * mins);
formData.value.startTime = startTime;
}
if (endTime) {
- endTime = getYMDHMS(new Date(endTime) - 1000 * 60 * mins);
+ endTime = getYMDHMS(new Date(endTime).getTime() - 1000 * 60 * mins);
formData.value.endTime = endTime;
}
- getList();
+ getList(false);
}
function getRangeMins() {
@@ -535,7 +766,13 @@
function onCheckTree(data, checked, indeterminate) {
formData.value.checkedItemData = [];
if (checked.checkedNodes) {
- formData.value.checkedItemData = [...checked.checkedNodes]
+ let cns = [...checked.checkedNodes]
+ for (let i = 0; i < cns.length; i++) {
+ if (cns[i].id.indexOf('-') !== -1) {
+ continue
+ }
+ formData.value.checkedItemData.push(cns[i])
+ }
}
debounce(getList, 1000);
}
@@ -561,9 +798,8 @@
calRateForm.value.itemMin = 0;
calRateForm.value.itemAvg = 0;
calRateForm.value.realCumulant = 0;
- return
} else {
- let dataView = itemDataObject[calRateForm.value.calItem]
+ let dataView = itemDataObject.value[calRateForm.value.calItem]
calRateForm.value.itemPreMax = dataView.preMax;
calRateForm.value.itemPreMin = dataView.preMin;
calRateForm.value.itemPreAvg = dataView.preAvg;
@@ -572,61 +808,80 @@
calRateForm.value.itemMin = dataView.hisMin;
calRateForm.value.itemAvg = dataView.hisAvg;
calRateForm.value.realCumulant = dataView.hisCumulant;
+ calDeviation(dataView.realData,dataView.preDataL,'deviation')
+ calDeviation(dataView.cumulantRealData,dataView.cumulantPreData,'deviationCumulant')
}
+ calAccuracyRate()
}
function calAccuracyRate() {
- this.$refs['calRateForm'].validate((valid) => {
- if (!valid) {
- return false
- }
- let dataView = itemDataObject[calRateForm.value.calItem]
- let seriesReaData = dataView.realData;
- let seriesPreData = dataView.preDataL;
- if (seriesReaData == null || seriesPreData == null ||
- seriesReaData.length === 0 || seriesPreData.length === 0) {
- loading2.value = false;
- return;
- }
- let predictValueMap = {};
- seriesPreData.forEach(function (item) {
- predictValueMap[item[0]] = item[1];
- })
- let pointValueMap = {};
- seriesReaData.forEach(function (item) {
- pointValueMap[item[0]] = item[1];
- })
- let inDeviation = Number(calRateForm.value.IN_DEVIATION);
- let outDeviation = Number(calRateForm.value.OUT_DEVIATION);
- if (inDeviation === 0 && outDeviation === 0) {
- loading2.value = false;
- return;
- }
- let inDeviationCount = 0;
- let outDeviationCount = 0;
- let totalCount = 0;
- for (let key in predictValueMap) {
- let predictValue = predictValueMap[key];
- let pointValue = pointValueMap[key];
- if (pointValue == null || "" === pointValue || predictValue == null || "" === predictValue) {
- continue;
- }
- let deviationAbs = (predictValue - pointValue) >= 0 ? (predictValue - pointValue) : (predictValue - pointValue) * -1;
- if (deviationAbs < inDeviation) {
- inDeviationCount = inDeviationCount + 1;
- }
- if (deviationAbs > outDeviation) {
- outDeviationCount = outDeviationCount + 1;
- }
- totalCount = totalCount + 1;
- }
+ const valid = calRateFormRef.value.validate()
+ if (!valid) return
- let rateIn = (inDeviationCount / totalCount * 100).toFixed(2);
- let rateOut = (outDeviationCount / totalCount * 100).toFixed(2);
- calRateForm.value.IN_ACCURACY_RATE = Number(rateIn);
- calRateForm.value.OUT_ACCURACY_RATE = Number(rateOut);
+ let dataView = itemDataObject.value[calRateForm.value.calItem]
+ let seriesReaData = dataView.realData;
+ let seriesPreData = dataView.preDataL;
+ if (seriesReaData == null || seriesPreData == null ||
+ seriesReaData.length === 0 || seriesPreData.length === 0) {
loading2.value = false;
+ return;
+ }
+ let predictValueMap = {};
+ seriesPreData.forEach(function (item) {
+ predictValueMap[item[0]] = item[1];
})
+ let pointValueMap = {};
+ seriesReaData.forEach(function (item) {
+ pointValueMap[item[0]] = item[1];
+ })
+ let inDeviation = Number(calRateForm.value.IN_DEVIATION);
+ let outDeviation = Number(calRateForm.value.OUT_DEVIATION);
+ if (inDeviation === 0 && outDeviation === 0) {
+ loading2.value = false;
+ return;
+ }
+ let inDeviationCount = 0;
+ let outDeviationCount = 0;
+ let totalCount = 0;
+ for (let key in predictValueMap) {
+ let predictValue = predictValueMap[key];
+ let pointValue = pointValueMap[key];
+ if (pointValue == null || "" === pointValue || predictValue == null || "" === predictValue) {
+ continue;
+ }
+ let deviationAbs = (predictValue - pointValue) >= 0 ? (predictValue - pointValue) : (predictValue - pointValue) * -1;
+ if (deviationAbs < inDeviation) {
+ inDeviationCount = inDeviationCount + 1;
+ }
+ if (deviationAbs > outDeviation) {
+ outDeviationCount = outDeviationCount + 1;
+ }
+ totalCount = totalCount + 1;
+ }
+
+ let rateIn = (inDeviationCount / totalCount * 100).toFixed(2);
+ let rateOut = (outDeviationCount / totalCount * 100).toFixed(2);
+ calRateForm.value.IN_ACCURACY_RATE = Number(rateIn);
+ calRateForm.value.OUT_ACCURACY_RATE = Number(rateOut);
+ loading2.value = false;
+}
+
+function calDeviation(realData,preDataL,key) {
+ if (realData == null || preDataL == null || realData.length === 0 || preDataL.length === 0) {
+ return;
+ }
+ const realObj = {}
+ realData.map(e => realObj[e[0]] = e[1])
+
+ let sum = 0;
+ let index = 0;
+ preDataL.forEach(e => {
+ if (realObj[e[0]] != undefined) {
+ sum += Math.abs(e[1] - realObj[e[0]])
+ index++
+ }
+ })
+ calRateForm.value[key] = Number((sum / index).toFixed(2))
}
function rightSearchDataByRange() {
@@ -635,22 +890,87 @@
let endTime = formData.value.endTime;
let predictTime = formData.value.predictTime;
if (predictTime) {
- predictTime = getYMDHMS(new Date(predictTime) - 0 + 1000 * 60 * mins);
+ predictTime = getYMDHMS(new Date(predictTime).getTime() + 1000 * 60 * mins);
formData.value.predictTime = predictTime;
}
if (startTime) {
- startTime = getYMDHMS(new Date(startTime) - 0 + 1000 * 60 * mins);
+ startTime = getYMDHMS(new Date(startTime).getTime() + 1000 * 60 * mins);
formData.value.startTime = startTime;
}
if (endTime) {
- endTime = getYMDHMS(new Date(endTime) - 0 + 1000 * 60 * mins);
+ endTime = getYMDHMS(new Date(endTime).getTime() + 1000 * 60 * mins);
formData.value.endTime = endTime;
}
- getList();
+ getList(false);
}
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ rangeDate: '',
+ startTime: '',
+ endTime: '',
+ predictTime: '',
+ predictTimeStr: '',
+ startTimeStr: '',
+ endTimeStr: '',
+ predictTimeStamp: 0,
+ startTimeStamp: 0,
+ endTimeStamp: 0,
+ currentStamp: '',
+ currentStamp60: '',
+ predictStamp: '',
+ chartCheck: ['T+L', '真实值'],
+ chartOptions: ['T+N', 'T+L', '当时', '真实值', '调整值', '预测累计', '真实累计'],
+ checkedItemData: [],
+ backItem: '',
+ backValue: 0,
+ backCoe: 1,
+ preCumulant: 0,
+ realCumulant: 0,
+ queryStep: 2,
+ isMultipleYRadio: '单坐标轴',
+ isMultipleY: false,
+ predictFreq: 2,
+ }
+ calRateForm.value = {
+ calItem: undefined,
+ IN_DEVIATION: 10,
+ OUT_DEVIATION: 50,
+ IN_ACCURACY_RATE: 0,
+ OUT_ACCURACY_RATE: 0,
+ itemAvg: 0,
+ itemMax: 0,
+ itemMin: 0,
+ itemPreAvg: 0,
+ itemPreMax: 0,
+ itemPreMin: 0,
+ preCumulant: 0,
+ realCumulant: 0,
+ deviation: 0, //平均绝对误差
+ deviationCumulant: 0, //累积量平均绝对误差
+ }
+ calRateFormRef.value?.resetFields()
+}
</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;
}
@@ -664,7 +984,8 @@
.his-body-tree {
height: 100%;
border: 1px solid lightgray;
- padding: 10px;
+ padding: 10px 10px 20px 10px;
+ overflow-y: auto;
}
.his-body-right {
@@ -681,7 +1002,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