From 3bf8ecf6a94e43b4ae9b1fe8bee8ab9d09c43e04 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 04 六月 2025 11:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/model/sche/model/index.ts | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts
index b2b130f..92d9b8a 100644
--- a/src/api/model/sche/model/index.ts
+++ b/src/api/model/sche/model/index.ts
@@ -5,6 +5,7 @@
import {CommonEnabled} from "@/utils/constants";
import {getItemList, ItemVO} from "@/api/data/plan/item";
import * as ItemApi from '@/api/data/ind/item/item'
+import {getPointSimpleList} from "@/api/data/da/point";
export interface ScheduleModelVO {
id: string
@@ -75,7 +76,7 @@
export const getModelParamList = async (id) => {
const dataPointList = ref([] as DataPointApi.DaPointVO)
- dataPointList.value = await DataPointApi.getPointList({})
+ dataPointList.value = await DataPointApi.getPointSimpleList({})
const pointList = []
if (dataPointList.value) {
dataPointList.value.forEach(item => {
@@ -124,7 +125,8 @@
planList.push(
{
id: item.id,
- name: item.itemName
+ name: item.itemName,
+ itemNo: item.itemNo
}
)
})
@@ -152,7 +154,8 @@
indList.push(
{
id: item.id,
- name: item.itemName
+ name: item.itemName,
+ itemNo: item.itemNo
}
)
})
@@ -164,5 +167,6 @@
'MergeItem': mergeItemList,
'PLAN': planList,
'IND': indList,
+ 'IND_ASCII': indList,
}
}
--
Gitblit v1.9.3