From 8d7d29c212001f44c00230b8491a441c241eeade Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 18 十月 2024 14:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/pre/item/MmPredictItemForm.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/model/pre/item/MmPredictItemForm.vue b/src/views/model/pre/item/MmPredictItemForm.vue
index 11d9120..4990942 100644
--- a/src/views/model/pre/item/MmPredictItemForm.vue
+++ b/src/views/model/pre/item/MmPredictItemForm.vue
@@ -5,7 +5,7 @@
v-loading="formLoading"
:model="dataForm"
:rules="formRules"
- label-width="120px"
+ label-width="100px"
>
<el-divider content-position="left">基本信息</el-divider>
<el-row>
@@ -157,8 +157,8 @@
</el-upload>
</el-col>
</el-row>
- <el-row :gutter="8" v-if="dataForm.itemtypename === 'NormalItem'">
- <el-col :span="12">
+ <el-row v-if="dataForm.itemtypename === 'NormalItem'">
+ <el-col :span="8">
<el-form-item label="结果">
<el-select v-model="dataForm.mmPredictModel.resultstrid" placeholder="请选择">
<el-option
@@ -169,7 +169,18 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
+ <el-form-item label="关联模型">
+ <el-select v-model="dataForm.mmPredictModel.mpkprojectid" placeholder="请选择">
+ <el-option
+ v-for="item in mpkProjectList"
+ :key="item.id"
+ :label="item.projectName"
+ :value="item.id"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
<el-form-item label="编号">
<el-input
v-model="dataForm.mmPredictModel.modelno" placeholder="编号" maxlength="30" readonly
@@ -362,6 +373,7 @@
import * as MmItemType from '@/api/model/pre/item'
import * as DmModule from '@/api/model/pre/dm'
import * as MmResultTable from '@/api/model/pre/result'
+import * as ProjectApi from '@/api/model/mpk/project'
import * as DaPoint from '@/api/data/da/point'
import {useUpload} from '@/api/model/pre/predict'
import * as ScheduleModelApi from '@/api/model/sche/model'
@@ -380,6 +392,7 @@
const itemTypeMap = ref({})
const moduleList = ref([])
const resultstridList = ref([])
+const mpkProjectList = ref([])
const pointNoList = ref([])
const pointList = ref([])
const pointMap = ref({})
@@ -448,7 +461,8 @@
methodname: undefined,
modelparamstructure: undefined,
resultstrid: undefined,
- settingmap: undefined
+ settingmap: undefined,
+ mpkprojectid: undefined
},
mmPredictMergeItem: {
id: undefined,
@@ -518,6 +532,9 @@
// 获取结果字符串列表
resultstridList.value = await MmResultTable.getResultstridList()
+ // 获取mpk项目列表
+ mpkProjectList.value = await ProjectApi.list()
+
// 获取数据点列表
pointNoList.value = await DaPoint.getPointList(queryParams)
if (pointNoList.value.length > 0) {
--
Gitblit v1.9.3