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/api/model/pre/autoAdjust/config.ts | 21 ++
src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue | 245 +++++++++++++++++++++++++++
src/utils/dict.ts | 5
src/api/model/pre/item/index.ts | 28 +++
src/views/model/pre/autoAdjust/index.vue | 183 ++++++++++++++++++++
src/views/model/pre/analysis/index.vue | 23 ++
6 files changed, 501 insertions(+), 4 deletions(-)
diff --git a/src/api/model/pre/autoAdjust/config.ts b/src/api/model/pre/autoAdjust/config.ts
new file mode 100644
index 0000000..b7ea5e0
--- /dev/null
+++ b/src/api/model/pre/autoAdjust/config.ts
@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+export const getPage = (params) => {
+ return request.get({ url: '/model/pre/auto-adjust-config/page', params })
+}
+
+export const getInfo = (id) => {
+ return request.get({ url: `/model/pre/auto-adjust-config/get/${id}`})
+}
+
+export const create = (data) => {
+ return request.post({ url: '/model/pre/auto-adjust-config/create', data })
+}
+
+export const update = (data) => {
+ return request.put({ url: '/model/pre/auto-adjust-config/update', data })
+}
+
+export const deleteConfig = (id) => {
+ return request.delete({ url: '/model/pre/auto-adjust-config/delete?id=' + id })
+}
diff --git a/src/api/model/pre/item/index.ts b/src/api/model/pre/item/index.ts
index 9a498ee..d6511d5 100644
--- a/src/api/model/pre/item/index.ts
+++ b/src/api/model/pre/item/index.ts
@@ -1,5 +1,6 @@
import request from '@/config/axios'
import {UploadRequestOptions} from "element-plus/es/components/upload/src/upload";
+import {CommonEnabled} from "@/utils/constants";
export interface MmPredictItemVO {
id: string,
@@ -148,3 +149,30 @@
export const getViewCharts = (params) => {
return request.get({ url: `/model/pre/item/view-charts`,params})
}
+
+export const getNormalItemList = async () => {
+ const predictItemList = await getMmPredictItemList({
+ status: CommonEnabled.ENABLE,
+ itemtypename: 'NormalItem',
+ })
+ const normalItemList = []
+ const predictNormalItemList = predictItemList.filter(e => e.outPuts && e.outPuts.length > 0);
+ if (predictNormalItemList && predictNormalItemList.length > 0) {
+ // 过滤掉本身
+ predictNormalItemList.forEach(item => {
+ normalItemList.push(
+ {
+ value: item.id,
+ label: item.itemname,
+ children: item.outPuts?.map(e => {
+ return {
+ value: e.id,
+ label: e.resultName
+ }
+ })
+ }
+ )
+ })
+ }
+ return normalItemList
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c125f74..67631f5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -194,5 +194,8 @@
ARC_TYPE = 'arc_type',
ARC_CALCULATE_TYPE = 'arc_calculate_type',
SOLIDIFY_FLAG = 'ind_solidify_flag',
- MODEL_STATUS = 'model_status'
+ MODEL_STATUS = 'model_status',
+ ADJUST_DIRECTION = 'adjust_direction',
+ ADJUST_TRIGGER_RULE = 'adjust_trigger_rule',
+ ADJUST_VALUE_RULE = 'adjust_value_rule'
}
diff --git a/src/views/model/pre/analysis/index.vue b/src/views/model/pre/analysis/index.vue
index a4dd2ec..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"
@@ -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,
diff --git a/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue b/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue
new file mode 100644
index 0000000..84c81b7
--- /dev/null
+++ b/src/views/model/pre/autoAdjust/MmPredictAutoAdjustConfigForm.vue
@@ -0,0 +1,245 @@
+<template>
+ <Dialog v-model="dialogVisible" :title="dialogTitle" width="50%">
+ <el-form
+ ref="formRef"
+ v-loading="formLoading"
+ :model="formData"
+ :rules="formRules"
+ label-width="130px"
+ >
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="配置名称" prop="configName">
+ <el-input v-model="formData.configName" placeholder="请输入配置名称"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="配置编码" prop="configCode">
+ <el-input v-model="formData.configCode" placeholder="请输入配置编码"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="预测项" prop="outputId">
+ <el-select-v2
+ v-model="formData.outputId"
+ :options="normalItemList || []"
+ placeholder="请选择"
+ :props="{value:'value',label:'label',options:'children'}"
+ clearable
+ filterable
+ :fit-input-width="false"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="测点" prop="pointId">
+ <el-select
+ v-model="formData.pointId"
+ filterable
+ clearable
+ placeholder="请选择">
+ <el-option
+ v-for="item in pointList"
+ :key="item.id"
+ :label="item.pointName"
+ :value="item.id"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="取值时间范围" prop="t">
+ <el-input-number v-model="formData.t" :min="1" clearable/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="调整方向" prop="adjustDirection">
+ <el-select v-model="formData.adjustDirection" placeholder="请选择调整方向">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.ADJUST_DIRECTION)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="触发规则" prop="triggerRule">
+ <el-select v-model="formData.triggerRule" placeholder="请选择触发规则">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ADJUST_TRIGGER_RULE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="触发值" prop="triggerValue">
+ <el-input-number v-model="formData.triggerValue"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="调整值计算规则" prop="adjustValueRule">
+ <el-select v-model="formData.adjustValueRule" placeholder="请选择调整值计算规则">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.ADJUST_VALUE_RULE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="调整长度" prop="adjustLength">
+ <el-input-number v-model="formData.adjustLength"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="是否启用" prop="isEnable">
+ <el-select v-model="formData.isEnable" placeholder="请选择">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ </template>
+ </Dialog>
+</template>
+<script lang="ts" setup>
+import {DICT_TYPE, getIntDictOptions,getStrDictOptions} from "@/utils/dict";
+import * as MmPredictItem from '@/api/model/pre/item'
+import {CommonEnabled} from "@/utils/constants";
+import * as AutoAdjustConfigApi from '@/api/model/pre/autoAdjust/config'
+import * as DaPoint from "@/api/data/da/point";
+
+defineOptions({name: 'MmPredictAutoAdjustConfigForm'})
+
+const {t} = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+ id: undefined,
+ configName: undefined,
+ configCode: undefined,
+ outputId: undefined,
+ pointId: undefined,
+ t: undefined,
+ triggerRule: undefined,
+ triggerValue: undefined,
+ adjustDirection: undefined,
+ adjustValueRule: undefined,
+ adjustLength: 1,
+ isEnable: 1,
+})
+const formRules = reactive({
+ configName: [{required: true, message: '配置名称不能为空', trigger: 'blur'}],
+ configCode: [{required: true, message: '配置编码不能为空', trigger: 'blur'}],
+ outputId: [{required: true, message: '预测输出不能为空', trigger: 'blur'}],
+ pointId: [{required: true, message: '测点不能为空', trigger: 'blur'}],
+ t: [{required: true, message: '取值时间范围不能为空', trigger: 'blur'}],
+ triggerRule: [{required: true, message: '触发规则不能为空', trigger: 'blur'}],
+ triggerValue: [{required: true, message: '触发值不能为空', trigger: 'blur'}],
+ adjustDirection: [{required: true, message: '调整方向不能为空', trigger: 'blur'}],
+ adjustValueRule: [{required: true, message: '调整值计算规则不能为空', trigger: 'blur'}],
+ adjustLength: [{required: true, message: '调整长度不能为空', trigger: 'blur'}],
+ isEnable: [{required: true, message: '是否启用不能为空', trigger: 'blur'}],
+})
+const formRef = ref() // 表单 Ref
+
+const normalItemList = ref([])
+const pointList = ref([])
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+ dialogVisible.value = true
+ dialogTitle.value = t('action.' + type)
+ formType.value = type
+ resetForm()
+
+ normalItemList.value = await MmPredictItem.getNormalItemList()
+ // 获取数据点列表
+ pointList.value = await DaPoint.getPointSimpleList({})
+
+ // 修改时，设置数据
+ if (id) {
+ formLoading.value = true
+ try {
+ formData.value = await AutoAdjustConfigApi.getInfo(id)
+ } finally {
+ formLoading.value = false
+ }
+ }
+
+}
+defineExpose({open}) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+ // 校验表单
+ if (!formRef) return
+ const valid = await formRef.value.validate()
+ if (!valid) return
+ // 提交请求
+ formLoading.value = true
+ try {
+ const data = formData.value
+ if (formType.value === 'create') {
+ await AutoAdjustConfigApi.create(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await AutoAdjustConfigApi.update(data)
+ message.success(t('common.updateSuccess'))
+ }
+ dialogVisible.value = false
+ // 发送操作成功的事件
+ emit('success')
+ } finally {
+ formLoading.value = false
+ }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ configName: undefined,
+ configCode: undefined,
+ outputId: undefined,
+ pointId: undefined,
+ t: undefined,
+ triggerRule: undefined,
+ triggerValue: undefined,
+ adjustDirection: undefined,
+ adjustLength: 1,
+ adjustValueRule: undefined,
+ isEnable: 1,
+ }
+ formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/model/pre/autoAdjust/index.vue b/src/views/model/pre/autoAdjust/index.vue
new file mode 100644
index 0000000..bc0a7ab
--- /dev/null
+++ b/src/views/model/pre/autoAdjust/index.vue
@@ -0,0 +1,183 @@
+<template>
+ <!-- 搜索 -->
+ <ContentWrap>
+ <el-form
+ class="-mb-15px"
+ :model="queryParams"
+ ref="queryFormRef"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="配置名称" prop="configName">
+ <el-input
+ v-model="queryParams.configName"
+ placeholder="请输入名称"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="配置编码" prop="configCode">
+ <el-input
+ v-model="queryParams.configCode"
+ placeholder="请输入编码"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery">
+ <Icon icon="ep:search" class="mr-5px" />
+ 搜索
+ </el-button>
+ <el-button @click="resetQuery">
+ <Icon icon="ep:refresh" class="mr-5px" />
+ 重置
+ </el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="openForm('create')"
+ v-hasPermi="['pre:auto-adjust-config:create']"
+ >
+ <Icon icon="ep:plus" class="mr-5px" />
+ 新增
+ </el-button>
+ </el-form-item>
+ </el-form>
+ </ContentWrap>
+
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table v-loading="loading" :data="list">
+ <el-table-column label="配置名称" header-align="center" align="center" min-width="150" prop="configName" fixed/>
+ <el-table-column label="配置编码" header-align="center" align="center" min-width="150" prop="configCode" />
+ <el-table-column label="预测项" header-align="center" align="center" min-width="150" prop="itemName" />
+ <el-table-column label="输出" header-align="center" align="center" min-width="150" prop="outputName" />
+ <el-table-column label="触发规则" align="center" min-width="60" prop="triggerRule">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ADJUST_TRIGGER_RULE" :value="scope.row.triggerRule" />
+ </template>
+ </el-table-column>
+ <el-table-column label="触发值" header-align="center" align="center" min-width="60" prop="triggerValue" />
+ <el-table-column label="调整值计算规则" align="center" min-width="100" prop="adjustValueRule">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ADJUST_VALUE_RULE" :value="scope.row.adjustValueRule" />
+ </template>
+ </el-table-column>
+ <el-table-column label="调整方向" header-align="center" min-width="60" align="center" prop="adjustDirection" >
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ADJUST_DIRECTION" :value="scope.row.adjustDirection" />
+ </template>
+ </el-table-column>
+ <el-table-column label="调整长度" header-align="center" align="center" min-width="60" prop="adjustLength" />
+ <el-table-column label="是否启用" header-align="center" align="center" min-width="100" prop="isEnable" >
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.COM_IS_INT" :value="scope.row.isEnable" />
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" align="center" min-width="160" fixed="right">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ v-hasPermi="['pre:auto-adjust-config:update']"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['pre:auto-adjust-config:delete']"
+ >
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 分页 -->
+ <Pagination
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </ContentWrap>
+
+ <!-- 表单弹窗：添加/修改 -->
+ <MmPredictAutoAdjustConfigForm ref="formRef" @success="getList" />
+
+</template>
+<script lang="ts" setup>
+import MmPredictAutoAdjustConfigForm from './MmPredictAutoAdjustConfigForm.vue'
+import * as AutoAdjustConfigApi from '@/api/model/pre/autoAdjust/config'
+import {DICT_TYPE} from "@/utils/dict";
+
+defineOptions({name: 'autoAdjust'})
+
+ const message = useMessage() // 消息弹窗
+ const {t} = useI18n() // 国际化
+
+ const loading = ref(true) // 列表的加载中
+ const total = ref(0) // 列表的总页数
+ const list = ref([]) // 列表的数据
+ const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ configName: undefined,
+ configCode: undefined,
+ })
+ const queryFormRef = ref() // 搜索的表单
+
+ /** 查询列表 */
+ const getList = async () => {
+ loading.value = true
+ try {
+ const page = await AutoAdjustConfigApi.getPage(queryParams)
+ list.value = page.list
+ total.value = page.total
+ } finally {
+ loading.value = false
+ }
+ }
+
+ /** 搜索按钮操作 */
+ const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
+ }
+
+ /** 重置按钮操作 */
+ const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
+ }
+
+ /** 添加/修改操作 */
+ const formRef = ref()
+ const openForm = (type: string, id?: number) => {
+ formRef.value.open(type, id)
+ }
+
+ /** 删除按钮操作 */
+ const handleDelete = async (id: number) => {
+ try {
+ // 删除的二次确认
+ await message.delConfirm()
+ // 发起删除
+ await AutoAdjustConfigApi.deleteConfig(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
+ await getList()
+ } catch {
+ }
+ }
+
+ /** 初始化 **/
+ onMounted(async () => {
+ await getList()
+ })
+</script>
--
Gitblit v1.9.3