From 4a92d33eb3157e8f31d4429eead1c7dfd3cacc13 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:45:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/MmPredictItemForm.vue | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index 1aa3fbc..22e5776 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,9 +105,24 @@
<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>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="真实数据点">
+ <el-select
+ v-model="dataForm.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>
@@ -386,11 +401,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"
>
@@ -544,7 +559,8 @@
num: undefined
},
mmModelArithSettingsList: [],
- mmModelParamList: []
+ mmModelParamList: [],
+ pointId: undefined
})
const formRules = reactive({
'mmPredictItem.itemname': [{required: true, message: '预测项名不能为空', trigger: 'blur'}],
@@ -916,7 +932,7 @@
fileList.value = []
}
-const changePredictLength = (value) => {
+const clearExpressionList = (value) => {
expressionList.value = [{
point: '',
operator: ''
--
Gitblit v1.9.3