From bb203eb72ee4604be8c9272cc583ecb9e393aeb8 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 04 十二月 2024 11:55:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/MmPredictItemForm.vue | 125 ++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 34 deletions(-)
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index 28e5345..c7d32b1 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>
@@ -201,7 +202,8 @@
<el-divider content-position="left" v-if="dataForm.itemtypename === 'NormalItem'">模型输出
</el-divider>
<el-button
- @click="addItemOutput(dataForm.mmItemOutputList)"
+ v-if="dataForm.itemtypename === 'NormalItem'"
+ @click="addItemOutput()"
type="primary"
size="small">
添加
@@ -283,6 +285,7 @@
<el-table-column prop="" label="值" align="center" min-width="200">
<template #default="scope">
<el-input size="mini" v-model="scope.row.value" maxlength="256"
+ :disabled="scope.row.key === 'pyFile'"
style="width:100%;height:100%"/>
</template>
</el-table-column>
@@ -312,7 +315,26 @@
</el-table-column>
<el-table-column prop="" label="参数名称" align="center">
<template #default="scope">
- <el-select
+ <el-select v-if="scope.row.modelparamtype === 'NormalItem'"
+ v-model="scope.row.modelparamid"
+ placeholder="请选择"
+ filterable
+ @change="changeModelparam(scope.row)"
+ style="width: 100%">
+ <el-option-group
+ v-for="group in modelparamListMap['NormalItem']"
+ :key="group.value"
+ :label="group.label"
+ >
+ <el-option
+ v-for="item in group.children"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-option-group>
+ </el-select>
+ <el-select v-else
v-model="scope.row.modelparamid"
filterable
@change="changeModelparam(scope.row)"
@@ -358,18 +380,28 @@
style="width: 100%; margin-top: 5px;">
<el-table-column
prop=""
- label="预测项"
+ label="预测项(NormalItem)"
align="center">
<template #default="scope">
<el-select
v-model="scope.row.point"
+ placeholder="请选择"
filterable
- placeholder="请选择">
- <el-option
- v-for="(item, index) in predictItemList"
- :key="index"
- :label="item.itemname"
- :value="item.itemno"/>
+ :no-data-text="'无数据（predictlength：' + dataForm.mmPredictItem.predictlength + '）'"
+ @change="changeNormalItemSelect"
+ style="width: 100%">
+ <el-option-group
+ v-for="group in modelparamListMap['NormalItem'].filter(e => e.predictlength == dataForm.mmPredictItem.predictlength)"
+ :key="group.value"
+ :label="group.label"
+ >
+ <el-option
+ v-for="item in group.children"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-option-group>
</el-select>
</template>
</el-table-column>
@@ -446,7 +478,6 @@
const pointNoList = ref([])
const pointList = ref([])
const pointMap = ref({})
-const predictItemList = ref([])
const modelparamListMap = ref({})
const modelparamMap = ref({})
const expressionList = ref([])
@@ -532,6 +563,7 @@
'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'}],
})
const formRef = ref() // 表单 Ref
@@ -547,7 +579,7 @@
setDefaultFields()
// 加载参数列表
- modelparamListMap.value = await ScheduleModelApi.getModelParamList()
+ modelparamListMap.value = await ScheduleModelApi.getModelParamList(id)
// 获取预测项类型列表
itemTypeList.value = await MmItemType.getItemTypeList()
@@ -563,11 +595,6 @@
// 获取mpk项目列表
mpkProjectList.value = await ProjectApi.list()
-
- // 获取normal列表
- predictItemList.value = await MmPredictItem.getMmPredictItemList({
- itemtypename: 'NormalItem'
- })
// 获取数据点列表
pointNoList.value = await DaPoint.getPointList(queryParams)
@@ -599,21 +626,40 @@
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
-
//校验模型输出
- if (dataForm.value.mmItemOutputList == undefined || dataForm.value.mmItemOutputList.length <= 0) {
- message.error("模型输出不为空")
- return
+ if (dataForm.value.itemtypename === 'NormalItem') {
+ if (dataForm.value.mmItemOutputList == undefined || dataForm.value.mmItemOutputList.length <= 0) {
+ message.error("模型输出不为空")
+ return
+ }
+
+ 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 === ''))) {
+ 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
+ }
+ })
+ if (flag) return
}
- 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 === ''))) {
- message.error("模型输出数据异常")
- flag = true
- }
- })
- if (flag) return
// 提交请求
formLoading.value = true
@@ -679,7 +725,7 @@
let endIndex = (indexSub == -1 || (indexPlus < indexSub && indexPlus !== -1)) ? indexPlus : indexSub
expressionList.value.push({
point: expression.substring(0, endIndex),
- operator: expression.substring(endIndex, 1)
+ operator: expression.substring(endIndex, endIndex + 1)
})
expression = expression.substring(endIndex + 1)
} else {
@@ -719,7 +765,8 @@
dataForm.value.mmPredictModel.modelparamstructure = ''
if (response.data.loadFieldSetList && response.data.loadFieldSetList[0].propertyList) {
response.data.loadFieldSetList[0].propertyList.forEach(function (value) {
- if (value.key !== 'data1') {
+ //匹配 data数字
+ if (!/^data\d+$/.test(value.key)) {
dataForm.value.mmModelArithSettingsList.push({
key: value.key,
name: value.name,
@@ -803,9 +850,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) {
@@ -866,6 +916,13 @@
fileList.value = []
}
+const changePredictLength = (value) => {
+ expressionList.value = [{
+ point: '',
+ operator: ''
+ }]
+}
+
/** 重置表单 */
const resetForm = () => {
dataForm.value = {
--
Gitblit v1.9.3