diff --git a/src/api/project/run.ts b/src/api/project/run.ts
new file mode 100644
index 0000000..04afb50
--- /dev/null
+++ b/src/api/project/run.ts
@@ -0,0 +1,85 @@
+import { post, upload } from '@/api/request';
+
+const env = import.meta.env;
+const PREFIX = env.VITE_API_PREFIX_PROJECT;
+
+/**
+ * 获取项目任务下的算例信息
+ * @param params
+ * @returns
+ */
+export const getTaskRunTreeApi = (params: any) => {
+ return post(`${PREFIX}run/getTaskRunTree`, params);
+};
+
+/**
+ * 新建算例
+ * @param params
+ * @returns
+ */
+export const addTaskRunApi = (params: any) => {
+ return post(`${PREFIX}run/addTaskRun`, params);
+};
+
+/**
+ * 查询算例信息
+ * @param params
+ * @returns
+ */
+export const queryTaskRunApi = (params: any) => {
+ return post(`${PREFIX}run/queryTaskRun`, params);
+};
+
+/**
+ * 创建算例下的结果文件夹
+ * @param params dirName文件夹名称 dirType文件夹类型默认2 uuId算例的uuid
+ * @returns
+ */
+export const createRunDirApi = (params: any) => {
+ return post(`${PREFIX}run/createRunDir`, params);
+};
+
+/**
+ * 查询算例结果文件夹及文件
+ * @param params uuId算例的uuid size 10 current 1
+ * @returns
+ */
+export const queryRunDirApi = (params: any) => {
+ return post(`${PREFIX}run/queryRunDir`, params);
+};
+
+/**
+ * 上传算例结果文件
+ * @param params file文件 dirId文件夹id fileName文件名称 fileType 1：模型文件 2：仿真报告 3：计算文件 4：曲线文件 5：云图文件
+ * @returns
+ */
+export const uploadRunFilesApi = (params: any) => {
+ return upload(`${PREFIX}run/uploadRunFiles`, params);
+};
+
+/**
+ * 删除算例
+ * @param params runId 算例的id
+ * @returns
+ */
+export const deleteTaskRunApi = (params: any) => {
+ return post(`${PREFIX}run/deleteTaskRun`, params);
+};
+
+/**
+ * 查询任务下的算例版本树
+ * @param params taskId算例uuid
+ * @returns
+ */
+export const getTaskRunVersionApi = (params: any) => {
+ return post(`${PREFIX}run/getTaskRunVersion`, params);
+};
+
+/**
+ * 查询算例版本树
+ * @param params runId算例的uuid
+ * @returns
+ */
+export const getRunVersionApi = (params: any) => {
+ return post(`${PREFIX}run/getRunVersion`, params);
+};
\ No newline at end of file
diff --git a/src/api/project/task.ts b/src/api/project/task.ts
index 41fd92e..029a486 100644
--- a/src/api/project/task.ts
+++ b/src/api/project/task.ts
@@ -29,15 +29,6 @@ export const getTaskCountApi = (params: any) => {
return post(`${PREFIX}task/count`, params);
};
-/**
- * 获取项目任务下的算例信息
- * @param params
- * @returns
- */
-export const getTaskRunTreeApi = (params: any) => {
- return post(`${PREFIX}run/getTaskRunTree`, params);
-};
-
/**
* 获取用户工作负载信息
* @param params
@@ -47,57 +38,3 @@ export const getListUserWorkloadsApi = (params: any) => {
return post(`${PREFIX}task/listUserWorkloads`, params);
};
-/**
- * 新建算例
- * @param params
- * @returns
- */
-export const addTaskRunApi = (params: any) => {
- return post(`${PREFIX}run/addTaskRun`, params);
-};
-
-/**
- * 查询算例信息
- * @param params
- * @returns
- */
-export const queryTaskRunApi = (params: any) => {
- return post(`${PREFIX}run/queryTaskRun`, params);
-};
-
-/**
- * 创建算例下的结果文件夹
- * @param params dirName文件夹名称 dirType文件夹类型默认2 uuId算例的uuid
- * @returns
- */
-export const createRunDirApi = (params: any) => {
- return post(`${PREFIX}run/createRunDir`, params);
-};
-
-/**
- * 查询算例结果文件夹及文件
- * @param params uuId算例的uuid size 10 current 1
- * @returns
- */
-export const queryRunDirApi = (params: any) => {
- return post(`${PREFIX}run/queryRunDir`, params);
-};
-
-/**
- * 上传算例结果文件
- * @param params file文件 dirId文件夹id fileName文件名称 fileType 1：模型文件 2：仿真报告 3：计算文件 4：曲线文件 5：云图文件
- * @returns
- */
-export const uploadRunFilesApi = (params: any) => {
- return upload(`${PREFIX}run/uploadRunFiles`, params);
-};
-
-/**
- * 删除算例
- * @param params runId 算例的id
- * @returns
- */
-export const deleteTaskRunApi = (params: any) => {
- return post(`${PREFIX}run/deleteTaskRun`, params);
-
-};
\ No newline at end of file
diff --git a/src/components/common/versionPreview/index.vue b/src/components/common/versionPreview/index.vue
index 522b11d..0a818f4 100644
--- a/src/components/common/versionPreview/index.vue
+++ b/src/components/common/versionPreview/index.vue
@@ -15,20 +15,23 @@
import { ref, nextTick, watchEffect, onBeforeUnmount } from 'vue';
import G6 from '@antv/g6';
import { random } from 'lodash';
-import UserIcon from '@/assets/imgs/versionTree/user.svg';
-import NavigationIcon from '@/assets/imgs/versionTree/skip.png';
+
+interface versionNodeItem {
+ label: string;
+ isOmit?: boolean;
+}
const props = withDefaults(
defineProps<{
- versionNode:any;
+ versionNode:versionNodeItem[];
treeData: any;
versionIndex: any;
- graphLoading: any;
- currentVersion: any;
- showVisionSelect: any;
+ graphLoading: boolean;
+ currentVersion: string;
+ showVisionSelect: boolean;
showElementList: any;
- showImg: any;
- currentNodeIndex: any;
+ showImg: boolean;
+ currentNodeIndex: number;
}>(),
{
versionIndex: 0,
@@ -159,7 +162,7 @@ const registerNode = () => {
y: 130 + 100 * index + 22,
width: 50,
height: 50,
- img: UserIcon,
+ img: '',
},
// 在 G6 3.3 及之后的版本中，必须指定 name，可以是任意字符串，但需要在同一个自定义元素类型中保持唯一性
name: 'image-shape' + index,
@@ -174,7 +177,7 @@ const registerNode = () => {
y: 130 + 100 * index + 22,
width: 50,
height: 50,
- img: UserIcon,
+ img: '',
},
// 在 G6 3.3 及之后的版本中，必须指定 name，可以是任意字符串，但需要在同一个自定义元素类型中保持唯一性
name: 'image-shape' + index,
@@ -237,7 +240,7 @@ const registerNode = () => {
y: 40,
width: 60,
height: 60,
- img: NavigationIcon,
+ img: '',
cursor: 'pointer',
},
// 在 G6 3.3 及之后的版本中，必须指定 name，可以是任意字符串，但需要在同一个自定义元素类型中保持唯一性
diff --git a/src/router/routerData.ts b/src/router/routerData.ts
index 3028102..14a7843 100644
--- a/src/router/routerData.ts
+++ b/src/router/routerData.ts
@@ -93,6 +93,12 @@ export default [
// component: () => import('@/views/task/execution/index.vue'),
component: () => import('@/views/task/execution/index.vue'),
},
+ {
+ title: '工作负载',
+ path: '/task/workLoad',
+ name: 'TaskWorkLoad',
+ component: () => import('@/views/task/workLoad/idnex.vue'),
+ },
],
},
diff --git a/src/utils/i18n/en.ts b/src/utils/i18n/en.ts
index 28d2c32..bdf174f 100644
--- a/src/utils/i18n/en.ts
+++ b/src/utils/i18n/en.ts
@@ -66,6 +66,7 @@ const lang = {
'用户组管理': 'User Group Management',
'应用管理': 'Application Management',
'动态表格': 'Dynamic Table',
+ '工作负载': 'Work Load',
},
'表格': {
'查询': 'Search',
diff --git a/src/utils/i18n/zh.ts b/src/utils/i18n/zh.ts
index 620b0ad..164a1bc 100644
--- a/src/utils/i18n/zh.ts
+++ b/src/utils/i18n/zh.ts
@@ -66,6 +66,7 @@ const lang = {
'用户组管理': '用户组管理',
'应用管理': '应用管理',
'动态表格': '动态表格',
+ '工作负载': '工作负载',
},
'表格': {
'查询': '查询',
diff --git a/src/views/task/execution/components/leftTaskTree/index.vue b/src/views/task/execution/components/leftTaskTree/index.vue
index 0abc708..10af7b2 100644
--- a/src/views/task/execution/components/leftTaskTree/index.vue
+++ b/src/views/task/execution/components/leftTaskTree/index.vue
@@ -157,7 +157,7 @@ import filterProject from '../filterProject/index.vue';
import { NODE_TYPE } from '@/utils/enum/node';
import { Folder, Document, ScaleToOriginal } from '@element-plus/icons-vue';
import createRunDiv from './operateComponent/createRunDiv.vue';
-import { addTaskRunApi, createRunDirApi, deleteTaskRunApi, getTaskRunTreeApi, queryTaskRunApi } from '@/api/project/task';
+import { addTaskRunApi, createRunDirApi, deleteTaskRunApi, getTaskRunTreeApi, queryTaskRunApi } from '@/api/project/run';
const emits = defineEmits(['nodeClickFn']);
const tableId = ref(new Date().getTime());
diff --git a/src/views/task/execution/components/runDetailPage/index.vue b/src/views/task/execution/components/runDetailPage/index.vue
index e0fef6b..c04588c 100644
--- a/src/views/task/execution/components/runDetailPage/index.vue
+++ b/src/views/task/execution/components/runDetailPage/index.vue
@@ -160,7 +160,6 @@ watch(() => props.runInfo, (newVal) => {
if (newVal) {
currentRunNodeInfo.value = newVal;
- console.log(newVal, 'newVal');
}
}, {
diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue
index 6d25fad..6e44568 100644
--- a/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue
+++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue
@@ -28,7 +28,7 @@
+
+