diff --git a/src/views/run/instant/CreateModal.vue b/src/views/run/instant/CreateModal.vue index e739cf9..9bef6b4 100644 --- a/src/views/run/instant/CreateModal.vue +++ b/src/views/run/instant/CreateModal.vue @@ -27,7 +27,6 @@ const state = reactive({ const isDisabled = ref(true) const [registerCreateModal, {setModalProps, closeModal}] = useModalInner(async (data) => { - alert(444) await resetFields() current.value=0; state.selectedData=[]; @@ -61,12 +60,13 @@ const [registerForm, {validate, resetFields,getFieldsValue, setFieldsValue, upda interface instantForms { modelId?: string mpName?: string + algorithmId?: string } const instantForm = reactive({ modelId: '', mpName: '', - + algorithmId: '' }) async function updatempName(selectedRowKeys, selectedRows) { resetFields() @@ -74,12 +74,13 @@ async function updatempName(selectedRowKeys, selectedRows) { state.selectedData = selectedRows; //读出模型中的点号信息 if (selectedRows.length !== 0) { - state.type = selectedRows[0].algorithm === 'ANN' + console.log(selectedRows) + state.type = selectedRows[0].algorithmId === '2' state.pointInfo = JSON.parse(selectedRows[0].modelInfo).pointInfo for (const p of state.pointInfo) { p.modelName = selectedRows[0].modelName p.modelDescription = selectedRows[0].description - p.algorithm = selectedRows[0].algorithm + p.algorithm = selectedRows[0].algorithmId } } @@ -124,6 +125,7 @@ async function updatempName(selectedRowKeys, selectedRows) { }) instantForm.modelId = selectedRows.length !== 0 ? `${selectedRows[0].modelId}` : `` instantForm.mpName = selectedRows.length !== 0 ? `${selectedRows[0].modelName}-实例` : `` + instantForm.algorithmId=selectedRows.length !== 0 ? `${selectedRows[0].algorithmId}` : `` setFieldsValue(instantForm) } @@ -146,6 +148,9 @@ async function handleSubmit() { // 获取子组件的测点列表数据 const pointInfoNew = pointRef.value.getPointTableData() values.pointInfo = pointInfoNew + console.log(pointInfoNew) + + alert(444) await createInstant(values) emit('success') createMessage.success(t('common.saveSuccessText')) diff --git a/src/views/run/instant/instant.data.ts b/src/views/run/instant/instant.data.ts index e00b697..34c28e9 100644 --- a/src/views/run/instant/instant.data.ts +++ b/src/views/run/instant/instant.data.ts @@ -348,6 +348,16 @@ export const createInstantForm: FormSchema[] = [ span: 12, }, }, + { + label: '算法id', + field: 'algorithmId', + component: 'Input', + required: true, + show: false, + colProps: { + span: 12, + }, + }, { label: '实例名称', field: 'mpName', diff --git a/src/views/run/model/PointTable.vue b/src/views/run/model/PointTable.vue index 10b3e69..6e326f2 100644 --- a/src/views/run/model/PointTable.vue +++ b/src/views/run/model/PointTable.vue @@ -1,5 +1,5 @@