merge
This commit is contained in:
@@ -276,3 +276,7 @@ export const generateNewReportApi = (params: any) => {
|
||||
export const retryFailedNodeApi = (params: any) => {
|
||||
return post(`${PREFIX}run/retryFailedNode`, params);
|
||||
};
|
||||
|
||||
export const batchAddFileInfoForTaskApi = (params: any) => {
|
||||
return post(`${PREFIX}run/batchAddFileInfoForTask`, params);
|
||||
};
|
||||
|
||||
@@ -99,3 +99,19 @@ export const updateUserFormConfigureApi = (params: any) => {
|
||||
export const getUserFormConfigureApi = async (params: any) => {
|
||||
return get(`${PREFIX}systemData/getUserFormConfigure`, params);
|
||||
};
|
||||
// 添加系统参数
|
||||
export const addSystemParamConfigureApi = (params: any) => {
|
||||
return post(`${PREFIX}systemData/addSystemParamConfigure`, params);
|
||||
};
|
||||
// 更新系统参数
|
||||
export const updateSystemParamConfigureApi = (params: any) => {
|
||||
return post(`${PREFIX}systemData/updateSystemParamConfigure`, params);
|
||||
};
|
||||
// 获取系统参数
|
||||
export const querySystemParamConfigureApi = async (params: any) => {
|
||||
return get(`${PREFIX}systemData/querySystemParamConfigure`, params);
|
||||
};
|
||||
// 获取系统所有参数
|
||||
export const querySystemAllParamConfigureApi = async (params: any) => {
|
||||
return get(`${PREFIX}systemData/querySystemAllParamConfigure`, params);
|
||||
};
|
||||
|
||||
@@ -13,13 +13,14 @@
|
||||
<template v-if="showLeftOptions" #leftOptions>
|
||||
<AddFile
|
||||
:accept="accept"
|
||||
:api="batchAddFileInfoApi"
|
||||
:api="batchAddFileInfoForTaskApi"
|
||||
:fileType="FILE_TYPE.PNG_FILE"
|
||||
tableName="TASK_DETAIL_UPLOAD_FILE"
|
||||
multiple
|
||||
:data="{
|
||||
dirId: nodeFIleId,
|
||||
projectId: null,
|
||||
uuid: taskId,
|
||||
}"
|
||||
@finished="uploadFinishedFun"
|
||||
/>
|
||||
@@ -40,7 +41,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch } from 'vue';
|
||||
import { batchAddFileInfoApi } from '@/api/data/data';
|
||||
import { batchAddFileInfoForTaskApi } from '@/api/project/run';
|
||||
import { queryTaskRunApi } from '@/api/project/run';
|
||||
import { NODE_TYPE } from '@/utils/enum/node';
|
||||
import { FILE_TYPE } from '@/utils/enum/file';
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
<template v-if="showLeftOptions" #leftOptions>
|
||||
<AddFile
|
||||
:accept="accept"
|
||||
:api="batchAddFileInfoApi"
|
||||
:api="batchAddFileInfoForTaskApi"
|
||||
:fileType="FILE_TYPE.MODEL_3D_FILE"
|
||||
tableName="TASK_DETAIL_UPLOAD_FILE"
|
||||
multiple
|
||||
:data="{
|
||||
dirId: nodeFIleId,
|
||||
projectId: null,
|
||||
uuid: currentId,
|
||||
}"
|
||||
@finished="uploadFinishedFun"
|
||||
/>
|
||||
@@ -47,7 +48,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch } from 'vue';
|
||||
import BaseTable from '@/components/common/table/baseTable.vue';
|
||||
import { batchAddFileInfoApi } from '@/api/data/data';
|
||||
import { batchAddFileInfoForTaskApi } from '@/api/project/run';
|
||||
import UploadFile from '@/components/common/uploadFile/index.vue';
|
||||
import FilePreview from '@/components/common/filePreview/index.vue';
|
||||
import AddFile from '@/components/common/addFile/index.vue';
|
||||
|
||||
@@ -13,13 +13,14 @@
|
||||
<template v-if="showLeftOptions" #leftOptions>
|
||||
<AddFile
|
||||
:accept="accept"
|
||||
:api="batchAddFileInfoApi"
|
||||
:api="batchAddFileInfoForTaskApi"
|
||||
:fileType="FILE_TYPE.CANVAS_FILE"
|
||||
tableName="TASK_DETAIL_UPLOAD_FILE"
|
||||
multiple
|
||||
:data="{
|
||||
dirId: nodeFIleId,
|
||||
projectId: null,
|
||||
uuid: taskId,
|
||||
}"
|
||||
@finished="uploadFinishedFun"
|
||||
/>
|
||||
@@ -70,7 +71,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, reactive, watch } from 'vue';
|
||||
import { batchAddFileInfoApi } from '@/api/data/data';
|
||||
import { batchAddFileInfoForTaskApi } from '@/api/project/run';
|
||||
import { initEcharts } from '../common/echartCard/echartsOptions';
|
||||
import { FILE_TYPE } from '@/utils/enum/file';
|
||||
import BaseTable from '@/components/common/table/baseTable.vue';
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
<template v-if="showLeftOptions" #leftOptions>
|
||||
<AddFile
|
||||
:accept="accept"
|
||||
:api="batchAddFileInfoApi"
|
||||
:api="batchAddFileInfoForTaskApi"
|
||||
:fileType="FILE_TYPE.CALCULATION_FILE"
|
||||
tableName="TASK_DETAIL_UPLOAD_FILE"
|
||||
multiple
|
||||
:data="{
|
||||
dirId: nodeFIleId,
|
||||
projectId: null,
|
||||
uuid: taskId,
|
||||
}"
|
||||
@finished="uploadFinishedFun"
|
||||
/>
|
||||
@@ -43,7 +44,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch } from 'vue';
|
||||
import BaseTable from '@/components/common/table/baseTable.vue';
|
||||
import { batchAddFileInfoApi } from '@/api/data/data';
|
||||
import { batchAddFileInfoForTaskApi } from '@/api/project/run';
|
||||
import UploadFile from '@/components/common/uploadFile/index.vue';
|
||||
import FilePreview from '@/components/common/filePreview/index.vue';
|
||||
import AddFile from '@/components/common/addFile/index.vue';
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
<template v-if="showLeftOptions" #leftOptions>
|
||||
<AddFile
|
||||
:accept="accept"
|
||||
:api="batchAddFileInfoApi"
|
||||
:api="batchAddFileInfoForTaskApi"
|
||||
:fileType="FILE_TYPE.REPORT_FILE"
|
||||
tableName="TASK_DETAIL_UPLOAD_FILE"
|
||||
multiple
|
||||
:data="{
|
||||
dirId: nodeFIleId,
|
||||
projectId: null,
|
||||
uuid: taskId,
|
||||
}"
|
||||
@finished="uploadFinishedFun"
|
||||
/>
|
||||
@@ -43,7 +44,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch } from 'vue';
|
||||
import BaseTable from '@/components/common/table/baseTable.vue';
|
||||
import { batchAddFileInfoApi } from '@/api/data/data';
|
||||
import { batchAddFileInfoForTaskApi } from '@/api/project/run';
|
||||
import {
|
||||
downloadFileById,
|
||||
downloadFileByStream,
|
||||
|
||||
@@ -181,8 +181,11 @@ const getUserGroupFun = async () => {
|
||||
if (res && res.code === 200) {
|
||||
groupList.value = res.data.data;
|
||||
if (groupList.value?.length) {
|
||||
// filterFprmData.userGroupId = groupList.value[0].id;
|
||||
// filterFprmData.userIds = await queryGroupUserListFun(filterFprmData.userGroupId);
|
||||
// 默认选择仿真组
|
||||
filterFprmData.userGroupId = groupList.value.filter((v) => v.groupName === '仿真组')[0]?.id;
|
||||
if (filterFprmData.userGroupId) {
|
||||
queryGroupUserListFun(filterFprmData.userGroupId);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user