From 90b99bc34954476d6ccd56296800c86af754edcc Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 12 十二月 2024 10:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/MmPredictItemForm.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index acb6797..eb370a4 100644
--- a/src/views/model/pre/item/MmPredictItemForm.vue
+++ b/src/views/model/pre/item/MmPredictItemForm.vue
@@ -103,8 +103,9 @@
</el-row>
<el-row v-if="dataForm.itemtypename === 'MergeItem'">
<el-col :span="12">
- <el-form-item label="预测长度">
+ <el-form-item label="预测长度" prop="mmPredictItem.predictlength">
<el-input
+ @change="changePredictLength"
v-model="dataForm.mmPredictItem.predictlength" placeholder="预测长度"
maxlength="5"/>
</el-form-item>
@@ -146,7 +147,7 @@
</el-row>
<el-row v-if="dataForm.itemtypename === 'NormalItem'">
<el-col :span="12">
- <el-form-item label="关联项目">
+ <el-form-item label="关联项目" prop="mmPredictModel.mpkprojectid">
<el-select v-model="dataForm.mmPredictModel.mpkprojectid" placeholder="请选择">
<el-option
v-for="item in mpkProjectList"
@@ -202,7 +203,7 @@
</el-divider>
<el-button
v-if="dataForm.itemtypename === 'NormalItem'"
- @click="addItemOutput(dataForm.mmItemOutputList)"
+ @click="addItemOutput()"
type="primary"
size="small">
添加
@@ -362,7 +363,7 @@
添加
</el-button>
<el-button
- @click="deleteRow(scope.$index, dataForm.mmModelParamList)"
+ @click="deleteRow(scope.$index, scope.row, dataForm.mmModelParamList)"
type="text"
size="mini">
删除
@@ -386,9 +387,11 @@
v-model="scope.row.point"
placeholder="请选择"
filterable
+ :no-data-text="'无数据（predictlength：' + dataForm.mmPredictItem.predictlength + '）'"
+ @change="changeNormalItemSelect"
style="width: 100%">
<el-option-group
- v-for="group in modelparamListMap['NormalItem']"
+ v-for="group in modelparamListMap['NormalItem'].filter(e => e.predictlength == dataForm.mmPredictItem.predictlength)"
:key="group.value"
:label="group.label"
>
@@ -560,6 +563,8 @@
'mmPredictItem.status': [{required: true, message: '是否启用不能为空', trigger: 'blur'}],
'dmModuleItem.moduleid': [{required: true, message: '管网不能为空', trigger: 'blur'}],
'dmModuleItem.itemorder': [{required: true, message: '排序不能为空', trigger: 'blur'}],
+ 'mmPredictItem.predictlength': [{required: true, message: '预测长度不能为空', trigger: 'blur'}],
+ 'mmPredictModel.mpkprojectid': [{required: true, message: '关联项目不能为空', trigger: 'blur'}],
})
const formRef = ref() // 表单 Ref
@@ -622,9 +627,8 @@
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
-
//校验模型输出
- if (dataForm.itemtypename === 'NormalItem') {
+ if (dataForm.value.itemtypename === 'NormalItem') {
if (dataForm.value.mmItemOutputList == undefined || dataForm.value.mmItemOutputList.length <= 0) {
message.error("模型输出不为空")
return
@@ -632,8 +636,24 @@
let flag = false
dataForm.value.mmItemOutputList.forEach(e => {
- if (e.resultstr == undefined || e.resultstr === '' || e.resultType == undefined || e.resultType === '' || e.pointid == undefined || e.pointid === '' || (e.resultType === 2 && (e.resultIndex == undefined || e.resultIndex === ''))) {
+ if (e.resultstr == undefined || e.resultstr === '' || e.resultType == undefined || e.resultType === '' || (e.resultType === 2 && (e.resultIndex == undefined || e.resultIndex === ''))) {
message.error("模型输出数据异常")
+ flag = true
+ return
+ }
+ })
+ if (flag) return
+ }
+ if (dataForm.value.itemtypename === 'MergeItem') {
+ if (expressionList.value == undefined || expressionList.value.length <= 1) {
+ message.error("表达式长度低于2")
+ return
+ }
+
+ let flag = false
+ expressionList.value.forEach((e,index) => {
+ if (e.point == undefined || e.point === '' || e.operator == undefined || (e.operator === '' && index != expressionList.value.length - 1)) {
+ message.error("表达式数据异常")
flag = true
return
}
@@ -816,9 +836,9 @@
rows.splice(index, 0, row)
}
-function deleteRow(index: string, rows) {
- if (!rows || rows.length === 1) {
- message.error('不能全部删除!')
+function deleteRow(index, row, rows) {
+ if (!rows || rows.length === 1 || rows.filter(e => e.modelparamportorder === row.modelparamportorder).length === 1) {
+ message.error('不可删除！')
return
}
rows.splice(index, 1)
@@ -831,9 +851,12 @@
orderRow(rows)
}
-function addItemOutput(list) {
- list.push({})
- orderItemOutput(list)
+function addItemOutput() {
+ if (!dataForm.value.mmItemOutputList) {
+ dataForm.value.mmItemOutputList = []
+ }
+ dataForm.value.mmItemOutputList.push({})
+ orderItemOutput(dataForm.value.mmItemOutputList)
}
function deleteItemOutput(index: string, rows) {
@@ -894,6 +917,13 @@
fileList.value = []
}
+const changePredictLength = (value) => {
+ expressionList.value = [{
+ point: '',
+ operator: ''
+ }]
+}
+
/** 重置表单 */
const resetForm = () => {
dataForm.value = {
--
Gitblit v1.9.3