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/api/model/sche/model/index.ts | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts
index 8863d31..9fb78ba 100644
--- a/src/api/model/sche/model/index.ts
+++ b/src/api/model/sche/model/index.ts
@@ -70,7 +70,7 @@
}
// 查询模型参数列表
-export const getModelParamList = async () => {
+export const getModelParamList = async (id) => {
const dataPointList = ref([] as DataPointApi.DaPointVO)
dataPointList.value = await DataPointApi.getPointList({})
@@ -91,13 +91,21 @@
status: CommonEnabled.ENABLE,
itemtypename: 'NormalItem'
})
- const itemList = []
+ const normalItemList = []
if (predictItemList.value) {
- predictItemList.value.forEach(item => {
- itemList.push(
+ // 过滤掉本身
+ predictItemList.value.filter(e => e.id !== id).forEach(item => {
+ normalItemList.push(
{
- id: item.id,
- name: item.itemname
+ value: item.id,
+ label: item.itemname,
+ predictlength: item.predictlength,
+ children: item.outPuts?.map(e => {
+ return {
+ value: e.id,
+ label: e.resultName
+ }
+ })
}
)
})
@@ -118,9 +126,28 @@
})
}
+
+ predictItemList.value = await PredictItemApi.getMmPredictItemList({
+ status: CommonEnabled.ENABLE,
+ itemtypename: 'MergeItem'
+ })
+ const mergeItemList = []
+ if (predictItemList.value) {
+ // 过滤掉本身
+ predictItemList.value.filter(e => e.id !== id).forEach(item => {
+ mergeItemList.push(
+ {
+ id: item.id,
+ name: item.itemname
+ }
+ )
+ })
+ }
+
return {
'DATAPOINT':pointList,
- 'PREDICTITEM': itemList,
+ 'NormalItem': normalItemList,
+ 'MergeItem': mergeItemList,
'PLAN': planList,
}
}
--
Gitblit v1.9.3