From 8bb7160c9c4fd7ce5893ee673647b13cc35410ae Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 03 三月 2025 17:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/model/sche/model/index.ts | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts
index 0ac2b05..39a1184 100644
--- a/src/api/model/sche/model/index.ts
+++ b/src/api/model/sche/model/index.ts
@@ -4,6 +4,8 @@
import * as PlanItemApi from '@/api/data/plan/item'
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
@@ -74,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 => {
@@ -143,10 +145,26 @@
})
}
+ // 指标数据
+ const indItemList = await ItemApi.getItemList({})
+ const indList = []
+ if (indItemList) {
+ indItemList.forEach(item => {
+ indList.push(
+ {
+ id: item.id,
+ name: item.itemName
+ }
+ )
+ })
+ }
+
return {
'DATAPOINT':pointList,
'NormalItem': normalItemList,
'MergeItem': mergeItemList,
'PLAN': planList,
+ 'IND': indList,
+ 'IND_ASCII': indList,
}
}
--
Gitblit v1.9.3