From 8d7d29c212001f44c00230b8491a441c241eeade Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期五, 18 十月 2024 14:05:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/api/model/sche/model/index.ts | 44 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/api/model/sche/model/index.ts b/src/api/model/sche/model/index.ts index 6fd6866..b0bf106 100644 --- a/src/api/model/sche/model/index.ts +++ b/src/api/model/sche/model/index.ts @@ -1,4 +1,7 @@ import request from '@/config/axios' +import * as DataPointApi from '@/api/data/da/point' +import * as PredictItemApi from '@/api/model/pre/predict' +import {CommonEnabled} from "@/utils/constants"; export interface ScheduleModelVO { id: string @@ -65,11 +68,40 @@ } // 查询模型参数列表 -export const getModelParamList = (modelparamListMap) => { - modelparamListMap['point'] = [] -} +export const getModelParamList = async () => { -// 查询getScheduleWorkPrecessList列表 -export const getScheduleWorkPrecessList = (data: WorkPrecessParamVO) => { - return request.get({ url: '/model/sche/model/work-process/list/all'},data) + const dataPointList = ref([] as DataPointApi.DaPointVO) + dataPointList.value = await DataPointApi.getPointList({}) + const pointList = [] + if (dataPointList.value) { + dataPointList.value.forEach(item => { + pointList.push( + { + id: item.id, + name: item.pointName + } + ) + }) + } + + const predictItemList = ref([] as PredictItemApi.MmPredictItemVO) + predictItemList.value = await PredictItemApi.getMmPredictItemList({ + status: CommonEnabled.ENABLE, + itemtypename: 'NormalItem' + }) + const itemList = [] + if (predictItemList.value) { + predictItemList.value.forEach(item => { + itemList.push( + { + id: item.id, + name: item.itemname + } + ) + }) + } + return { + 'DATAPOINT':pointList, + 'PREDICTITEM': itemList + } } -- Gitblit v1.9.3