Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-02-10 15:22:59 +08:00
parent c17a6e3250
commit 78e3322b6a
16 changed files with 2 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/flow/flowFileUpload.vue
View File

@@ -18,7 +18,7 @@
:disabled="readonly"
:on-change="handelChangeFun"
>
<el-button link type="primary">点击或拖拽文件上传 </el-button>
<el-button link type="primary">点击或拖拽文件上传</el-button>
</el-upload>
<div class="select-file-list">
<div class="select-file-item" v-for="item in row?.defaultValue" :key="item">

64
src/views/data/analysis/components/cloudImage.vue
View File

@@ -89,7 +89,6 @@ const imgLists = ref<any>([]);
const getTableColumnFun = (data: any) => {
const checkTypes = props.checkType;
console.log(data, 'datadatadata');
let key = 'owntaskName';
if (checkTypes === '仿真任务') {
key = 'owntaskName';
@@ -119,70 +118,7 @@ const getTableColumnFun = (data: any) => {
imgLists.value.push(obj);
}
console.log(imgLists.value, 'imgLists.value');
return;
showTableContent.value = false;
tableData.value = [];
tableColumns.value = [];
const list: any = data || [];
const defaultColumns: any = [
{
title: '云图信息',
key: 'attributes',
isShow: true,
},
];
const cloudcolumns: any = [];
for (let i = 0; i < list.length; i++) {
const obj: any = {
title: `${list[i].runName}-${list[i].originalName}`,
key: `${list[i].taskId}_${list[i].uuid}_${list[i].id}`,
isShow: true,
};
cloudcolumns.push(obj);
}
tableColumns.value = defaultColumns.concat(cloudcolumns);
tableColumns.value = objectTypeArrayRemovesDuplicates(tableColumns.value, 2);
if (props.cloumnWidth) {
for (let i = 0; i < tableColumns.value.length; i++) {
tableColumns.value[i].width = props.cloumnWidth;
}
}
const listData: any = [];
for (let i = 0; i < tableColumns.value.length; i++) {
const obj: any = {};
const str = tableColumns.value[i].key;
obj[str] = [];
for (let j = 0; j < list.length; j++) {
const str2 = list[j].taskId + '_' + list[j].uuid + '_' + list[j].id;
if (str2 === str) {
obj[str].push(list[j].id);
}
}
obj[str] = obj[str].join('_');
if (obj[str]) {
listData.push(obj);
}
}
const pngObj: any = {};
for (let i = 0; i < listData.length; i++) {
for (const key in listData[i]) {
pngObj[key] = listData[i][key];
}
}
showTableContent.value = true;
tableData.value.push(pngObj);
nextTick(() => {
cloudTableRef.value.setDataFun(tableData.value);
});
};
const getImgPathFun = (id: any) => {

3
src/views/data/analysis/components/modelFileResult.vue
View File

@@ -174,9 +174,6 @@ const getTableColumnFun = (data: any) => {
tableData.value.push(obj);
}
console.log(tableData.value, 'tableData.value');
console.log(tableColumns.value, 'tableColumns.value');
showTableContent.value = true;
nextTick(() => {

2
src/views/data/analysis/components/reportComparison.vue
View File

@@ -191,8 +191,6 @@ const getTableColumnFun = (data: any) => {
showTableContent.value = true;
console.log(tableData.value, 'tableData.value');
nextTick(() => {
calculationFileTableRef.value.setDataFun(tableData.value);
});

1
src/views/simulation/creation/components/stencil.ts
View File

@@ -159,7 +159,6 @@ export const getNodeList = async (noload?: any) => {
// if (!noload) {
// apps[i].nodeParamConfigName = await getAppConfigListFun(apps[i].uuid);
// }
console.log('typeKeyArray[apps[i].appType]', typeKeyArray[apps[i].appType]);
if (typeKeyArray[apps[i].appType]) {
typeKeyArray[apps[i].appType].nodes.push(apps[i]);
appList.push(apps[i]);

1
src/views/system/configuration/components/roleDiscipline.vue
View File

@@ -297,7 +297,6 @@ watch(
);
// const testDisciplines = () => {
// const adminDisciplines = getDisciplineByRole('ROLE_ADMIN, PMO');
// console.log(adminDisciplines, '---');
// };
// testDisciplines();

1
src/views/task/dashboard/components/dataStatistics/taskCompletion.vue
View File

@@ -34,7 +34,6 @@ const props = defineProps({
default: () => [],
},
});
console.log('props', props.resultTagType);
const chartOption = ref();
const initTaskCompleteChart = async (formData: any) => {

2
src/views/task/execution/components/leftTaskTree/index.vue
View File

@@ -716,9 +716,7 @@ const timer = ref<any>();
// 固定时间刷新左侧树的状态
const refreshTreeDataFun = async () => {
const newTreeData = await getTaskRunTreeDataFun(filterParam.value);
asyncTreeData(dataSource.value, newTreeData);
console.log(newTreeData, 'newTreeData');
};
const asyncTreeData = (list: any, data: any) => {

2
src/views/task/execution/components/leftTaskTree/operateComponent/createReportNew.vue
View File

@@ -172,8 +172,6 @@ const createSuccessFun = async () => {
ElMessage.warning('导出失败');
isLoading.value = false;
}
console.log(list, 'listlist');
};
const selectCsvFun = async (list: any) => {

4
src/views/task/execution/components/runDetailPage/index.vue
View File

@@ -396,8 +396,6 @@ const changeCurrentFlowNodeFun = (info: any) => {
refreshPage.value = false;
const { node, data, process }: any = info;
console.log(info, 'info');
flowNode.value = node;
flowNodeData.value = data;
flowNodeData.value.copyNodeStatus = data.nodeStatus;
@@ -815,7 +813,7 @@ const retryFailedNodeFun = async () => {
refreshRunFlowInfo();
}
} catch (error) {
console.log(error);
console.error(error);
}
};

4
src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue
View File

@@ -752,7 +752,6 @@ const actionList = ref([
uploadFIleFormData.xQuantityType = quantityTypeList.value.find((item: any) => {
return item.label === currentFileInfo.value.xquantityType;
})?.name;
console.log(uploadFIleFormData.xQuantityType, 'uploadFIleFormData.xQuantityType');
if (getdirNameFun() === '曲线结果') {
getQuantityUnitFun('xQuantityType', 'xUnitsList');
}
@@ -950,7 +949,6 @@ const initProjectTaskAchievementStatistics = async ({
titleList,
key,
}: any) => {
// console.log('XData', XData);
dom.commonChartRef.disposeEchartsByKey('chart-' + key);
dom.commonChartRef.option = {
title: {
@@ -1206,8 +1204,6 @@ const submitFun2 = async () => {
delete params.yunitsList;
delete params.xunitsList;
console.log(params, 'params');
await addSimulationKeyResultApi(params).then((res: any) => {
if (res.code === 200) {
} else {

1
src/views/task/projectDetail/components/statisticAnalysis.vue
View File

@@ -324,7 +324,6 @@ const queryTaskCompletionByWorkspace = async () => {
series: seriesData,
};
taskCompletionAtWorkstations.value = { ...option };
// console.log('taskCompletionAtWorkstations.value', taskCompletionAtWorkstations.value);
};
// #endregion

11
src/views/task/projectList/components/taskDialog.vue
View File

@@ -826,21 +826,11 @@ const addOrEditTaskFun = async () => {
dialogApproveUserVisible.value = true;
return;
const modifyRes = await updateTreeDataApi(insertTreeList, removeRecords, updateList);
// }
loadingInterface.value = false;
if (modifyRes) {
emits('taskComplete', 'taskPlanPage');
closeFun();
}
};
const onAddApproveConfirmFun = async (formData: any) => {
// dialogApproveUserVisible.value = false;
console.log(formData, 'formData');
const deleteNodeList = getListIds(
approveParam.value.removeRecords.map((item: any) => {
return { ...item, children: [] };
@@ -1215,7 +1205,6 @@ const batchUpdateTaskConfirmFun = async () => {
const selectTasks = getRightVxeRef().getCheckboxRecords();
debugger;
for (let index = 0; index < selectTasks.length; index++) {
// console.log('getListAndIds', disposeTaskMembers('getListAndIds', updateData));
const newObj = {
...selectTasks[index],
...disposeTaskMembers('getListAndIds', updateData),

2
src/views/task/simulationTask/components/taskTable.vue
View File

@@ -495,7 +495,6 @@ defineExpose({
// 预制参数_从首页点击跳转过来的参数
const gettParams = () => {
const params = localStorage.getItem('HOME_TASK_PARAMS');
console.log('SPDM_ROUTER_CHANGE', params);
if (params) {
const paramsObj = filterBtnList.value.find((item) => item.key === params);
if (paramsObj) {
@@ -511,7 +510,6 @@ const gettParams = () => {
}
};
emitter.on('SPDM_ROUTER_CHANGE', (data: any) => {
console.log('SPDM_ROUTER_CHANGE', data);
if (data.path === '/spdm/task/execute') {
gettParams();
}

1
src/views/task/simulationTask/mySend/index.vue
View File

@@ -141,7 +141,6 @@ const actionList = ref([
title: '编辑',
type: 'primary',
click: (row: any) => {
// console.log('tag9', row['tag9'], enableConfigByTenant([TENANT_ENUM.LYRIC]));
// 从需求来的任务，走分发逻辑,lyric定制逻辑
if (
!isSend.value &&

2
src/views/task/simulationTask/newDemand/index.vue
View File

@@ -274,7 +274,6 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
// let pMemberList = '';
// if (row.pMemberList) {
// pMemberList = getMemberListIds(row.pMemberList);
// console.log('editFormInfo.value.pMemberList', editFormInfo.value.pMemberList);
// }
let tMemberList = '';
if (row.tMemberList) {
@@ -393,7 +392,6 @@ const createDemandApiFun = async (fromData: any) => {
// 是否走利元亨创建需求直接创建任务逻辑
isLyric: enableConfigByTenant([TENANT_ENUM.LYRIC]),
};
// console.log('params', params, editFormInfo.value);
// return;
const res: any = await addDemandNoPermissionApi(params);
if (res.code === 200) {