From 4a92d33eb3157e8f31d4429eead1c7dfd3cacc13 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:45:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/model/sche/model/index.ts | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts
index 386850b..0ac2b05 100644
--- a/src/api/model/sche/model/index.ts
+++ b/src/api/model/sche/model/index.ts
@@ -20,6 +20,7 @@
status: number,
paramList: null,
settingList: null
+ modelOut:null
}
export interface ModelParamVO {
@@ -80,7 +81,8 @@
pointList.push(
{
id: item.id,
- name: item.pointName
+ name: item.pointName,
+ itemNo : item.pointNo
}
)
})
@@ -88,13 +90,13 @@
const predictItemList = ref([] as PredictItemApi.MmPredictItemVO)
predictItemList.value = await PredictItemApi.getMmPredictItemList({
- status: CommonEnabled.ENABLE,
- itemtypename: 'NormalItem'
+ status: CommonEnabled.ENABLE
})
const normalItemList = []
- if (predictItemList.value) {
+ const predictNormalItemList = predictItemList.value.filter(e => e.itemtypename === 'NormalItem' && e.outPuts && e.outPuts.length > 0);
+ if (predictNormalItemList && predictNormalItemList.length > 0) {
// 过滤掉本身
- predictItemList.value.filter(e => e.id !== id).forEach(item => {
+ predictNormalItemList.filter(e => e.id !== id).forEach(item => {
normalItemList.push(
{
value: item.id,
@@ -127,18 +129,14 @@
})
}
-
- predictItemList.value = await PredictItemApi.getMmPredictItemList({
- status: CommonEnabled.ENABLE,
- itemtypename: 'MergeItem'
- })
+ const predictMergeItemList = predictItemList.value.filter(e => e.itemtypename === 'MergeItem' && e.outPuts && e.outPuts.length > 0);
const mergeItemList = []
- if (predictItemList.value) {
+ if (predictMergeItemList && predictMergeItemList.length > 0) {
// 过滤掉本身
- predictItemList.value.filter(e => e.id !== id).forEach(item => {
+ predictMergeItemList.filter(e => e.id !== id).forEach(item => {
mergeItemList.push(
{
- id: item.id,
+ id: item.outPuts[0].id,
name: item.itemname
}
)
--
Gitblit v1.9.3