From f5e3a1fdf8e28cd2eea676d4417890ba2e9bf57b Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 19 十二月 2024 11:35:19 +0800
Subject: [PATCH] 计算预测项，选择表达式的预测项，添加管网限制，必须是同一个管网下，预测长度相同
---
src/views/model/pre/item/MmPredictItemForm.vue | 10 +++++-----
src/api/model/sche/model/index.ts | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts
index 9fb78ba..386850b 100644
--- a/src/api/model/sche/model/index.ts
+++ b/src/api/model/sche/model/index.ts
@@ -100,6 +100,7 @@
value: item.id,
label: item.itemname,
predictlength: item.predictlength,
+ moduleid: item.moduleid,
children: item.outPuts?.map(e => {
return {
value: e.id,
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index 1aa3fbc..c48cbd5 100644
--- a/src/views/model/pre/item/MmPredictItemForm.vue
+++ b/src/views/model/pre/item/MmPredictItemForm.vue
@@ -78,7 +78,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="管网" prop="dmModuleItem.moduleid">
- <el-select v-model="dataForm.dmModuleItem.moduleid" placeholder="请选择">
+ <el-select v-model="dataForm.dmModuleItem.moduleid" placeholder="请选择" @change="clearExpressionList">
<el-option
v-for="item in moduleList"
:key="item.id"
@@ -105,7 +105,7 @@
<el-col :span="12">
<el-form-item label="预测长度" prop="mmPredictItem.predictlength">
<el-input
- @change="changePredictLength"
+ @change="clearExpressionList"
v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
maxlength="5"/>
</el-form-item>
@@ -386,11 +386,11 @@
v-model="scope.row.point"
placeholder="请选择"
filterable
- :no-data-text="'无数据（predictlength：' + dataForm.mmPredictItem.predictlength + '）'"
+ :no-data-text="'无数据（预测长度：' + dataForm.mmPredictItem.predictlength + '；管网：' + moduleList.find(e => e.id === dataForm.dmModuleItem.moduleid)?.modulename + '）'"
@change="changeNormalItemSelect"
style="width: 100%">
<el-option-group
- v-for="group in modelparamListMap['NormalItem'].filter(e => e.predictlength == dataForm.mmPredictItem.predictlength)"
+ v-for="group in modelparamListMap['NormalItem'].filter(e => e.predictlength == dataForm.mmPredictItem.predictlength && e.moduleid === dataForm.dmModuleItem.moduleid)"
:key="group.value"
:label="group.label"
>
@@ -916,7 +916,7 @@
fileList.value = []
}
-const changePredictLength = (value) => {
+const clearExpressionList = (value) => {
expressionList.value = [{
point: '',
operator: ''
--
Gitblit v1.9.3