From 291bf570b2106cb99b0e689af7d6ccaacc9e5c1c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 18:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3
---
src/api/model/sche/model/index.ts | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts
index ebc1603..d850247 100644
--- a/src/api/model/sche/model/index.ts
+++ b/src/api/model/sche/model/index.ts
@@ -1,7 +1,9 @@
import request from '@/config/axios'
import * as DataPointApi from '@/api/data/da/point'
-import * as PredictItemApi from '@/api/model/pre/predict'
+import * as PredictItemApi from '@/api/model/pre/item'
+import * as PlanItemApi from '@/api/data/plan/item'
import {CommonEnabled} from "@/utils/constants";
+import {getItemList, ItemVO} from "@/api/data/plan/item";
export interface ScheduleModelVO {
id: string
@@ -68,7 +70,7 @@
}
// 查询模型参数列表
-export const getModelParamList = async () => {
+export const getModelParamList = async (id) => {
const dataPointList = ref([] as DataPointApi.DaPointVO)
dataPointList.value = await DataPointApi.getPointList({})
@@ -77,7 +79,7 @@
dataPointList.value.forEach(item => {
pointList.push(
{
- id: item.pointNo,
+ id: item.id,
name: item.pointName
}
)
@@ -86,22 +88,63 @@
const predictItemList = ref([] as PredictItemApi.MmPredictItemVO)
predictItemList.value = await PredictItemApi.getMmPredictItemList({
- status: CommonEnabled.ENABLE,
- itemtypename: 'NormalItem'
+ status: CommonEnabled.ENABLE
})
- const itemList = []
- if (predictItemList.value) {
- predictItemList.value.forEach(item => {
- itemList.push(
+ const normalItemList = []
+ const predictNormalItemList = predictItemList.value.filter(e => e.itemtypename === 'NormalItem' && e.outPuts && e.outPuts.length > 0);
+ if (predictNormalItemList && predictNormalItemList.length > 0) {
+ // 过滤掉本身
+ predictNormalItemList.filter(e => e.id !== id).forEach(item => {
+ normalItemList.push(
{
- id: item.id,
- name: item.itemname
+ value: item.id,
+ label: item.itemname,
+ predictlength: item.predictlength,
+ moduleid: item.moduleid,
+ children: item.outPuts?.map(e => {
+ return {
+ value: e.id,
+ label: e.resultName
+ }
+ })
}
)
})
}
+
+ const planItemList = ref([] as PlanItemApi.ItemVO)
+ planItemList.value = await PlanItemApi.getItemList({
+ })
+ const planList = []
+ if (planItemList.value) {
+ planItemList.value.forEach(item => {
+ planList.push(
+ {
+ id: item.id,
+ name: item.itemName
+ }
+ )
+ })
+ }
+
+ const predictMergeItemList = predictItemList.value.filter(e => e.itemtypename === 'MergeItem' && e.outPuts && e.outPuts.length > 0);
+ const mergeItemList = []
+ if (predictMergeItemList && predictMergeItemList.length > 0) {
+ // 过滤掉本身
+ predictMergeItemList.filter(e => e.id !== id).forEach(item => {
+ mergeItemList.push(
+ {
+ id: item.outPuts[0].id,
+ name: item.itemname
+ }
+ )
+ })
+ }
+
return {
'DATAPOINT':pointList,
- 'PREDICTITEM': itemList
+ 'NormalItem': normalItemList,
+ 'MergeItem': mergeItemList,
+ 'PLAN': planList,
}
}
--
Gitblit v1.9.3