diff --git a/src/components/common/table/baseTable.vue b/src/components/common/table/baseTable.vue index 01553930..afb07349 100644 --- a/src/components/common/table/baseTable.vue +++ b/src/components/common/table/baseTable.vue @@ -38,14 +38,14 @@ - +
- +
diff --git a/src/components/common/table/formItem.vue b/src/components/common/table/formItem.vue index 09b16018..0415c8db 100644 --- a/src/components/common/table/formItem.vue +++ b/src/components/common/table/formItem.vue @@ -181,3 +181,9 @@ const removeFun = (key: string, val: any) => { }); }; + + diff --git a/src/components/common/table/treeTable.vue b/src/components/common/table/treeTable.vue index 8756dc51..974270fb 100644 --- a/src/components/common/table/treeTable.vue +++ b/src/components/common/table/treeTable.vue @@ -22,14 +22,14 @@
- +
- +
diff --git a/src/components/common/uploadList/index.vue b/src/components/common/uploadList/index.vue index 6f65bda7..0df47305 100644 --- a/src/components/common/uploadList/index.vue +++ b/src/components/common/uploadList/index.vue @@ -55,7 +55,7 @@ import emitter from '@/utils/eventBus'; const taskStatusObj: any = {}; // 更具uploadTaskId和businessId记录所以任务文件的上传状态 const listVisible = ref(false); const listData = ref([]); -const chunkSize = 1024 * 1024 * 5; // 每片5MB +const chunkSize = 1024 * 1024 * 10; // 每片10MB const UPLOAD_FILE_STATUS: any = { // TODO '-1': '上传失败', '0': '待上传', diff --git a/src/views/data/overview/index.vue b/src/views/data/overview/index.vue index 2d108748..bd1e4f77 100644 --- a/src/views/data/overview/index.vue +++ b/src/views/data/overview/index.vue @@ -166,7 +166,8 @@ import { ref, onMounted } from 'vue'; import FileTree from '@/components/common/dataFileTree/index.vue'; import { getSimulationNodeTreeApi, getAllTemplateApi } from '@/api/data/dimensionTemplate'; -import { addNodeForDataApi, addTaskForDataApi } from '@/api/project/node'; +import { addNodeForDataApi, addTaskForDataApi, getNodeDetailForDataApi } from '@/api/project/node'; +import { getTaskDetailApi } from '@/api/project/task'; import { dataOverViewListSimulationNodeFilesApi, dataOverViewDeleteSimulationNodeFilesApi, dataOverViewUploadSimulationNodeFilesApi } from '@/api/data/dataOverView'; import BaseTable from '@/components/common/table/baseTable.vue'; import Configuration from './components/configuration.vue'; @@ -246,6 +247,7 @@ const editFun = () => { ElMessage.warning('请选择一个目录'); return; } + nodeType.value = currentData.value.relatedResourceUuidOwnType; if (currentData.value.relatedResourceUuidOwnType === NODE_TYPE.PROJECT) { editId.value = currentData.value.relatedResourceUuid; showProjectInfoDialog.value = true; @@ -254,15 +256,29 @@ const editFun = () => { editId.value = currentData.value.relatedParentUuid; showNodeInfoDialog.value = true; } - if (currentData.value.relatedResourceUuidOwnType === NODE_TYPE.WORKSPACE) { + if ([NODE_TYPE.WORKSPACE, NODE_TYPE.MACHINE].includes(currentData.value.relatedResourceUuidOwnType)) { editId.value = currentData.value.relatedParentUuid; - editData.value = { - nodeName: currentData.value.originalName, - englishName: '', - nodeCode: '', - nodeType: currentData.value.relatedResourceUuidOwnType, + const params = { + relatedResourceUuid: currentData.value.relatedResourceUuid, }; - modalVisible.value = true; + getNodeDetailForDataApi(params).then((res: any) => { + if (res.code === 200) { + editData.value = res.data; + } + modalVisible.value = true; + }); + } + if ([NODE_TYPE.TASK].includes(currentData.value.relatedResourceUuidOwnType)) { + editId.value = currentData.value.relatedParentUuid; + const params = { + relatedResourceUuid: currentData.value.relatedResourceUuid, + }; + getTaskDetailApi(params).then((res: any) => { + if (res.code === 200) { + editData.value = res.data; + } + modalVisible.value = true; + }); } };