merge

2026-01-16 16:40:54 +08:00
parent 8b866a590d
commit 260c454809
24 changed files with 12 additions and 84 deletions
--- a/src/components/common/treeCaseTable/loadCaseTable.vue
+++ b/src/components/common/treeCaseTable/loadCaseTable.vue
@@ -493,7 +493,6 @@ const actionList = computed(() => {
 });
 const checkboxChangeFun = () => {
  const checkRowData = loadcaseTableRef.value?.getCheckboxRecordsFun(true) || [];
-  console.log('checkRowData', checkRowData);
  canAddChildFun(checkRowData, NODE_TYPE.CATEGORY);
  canAddChildFun(checkRowData, NODE_TYPE.TASK);
  canAddChildFun(checkRowData, NODE_TYPE.PERFORMANCE);
--- a/src/components/taskDetail/resultImage.vue
+++ b/src/components/taskDetail/resultImage.vue
@@ -149,9 +149,7 @@ const deleteFun = async (row: any) => {
    if (res && res.code === 200) {
      baseTableRef.value.resetFun();
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 const getfileType = (data: any) => {
--- a/src/components/taskDetail/task3DModel.vue
+++ b/src/components/taskDetail/task3DModel.vue
@@ -141,9 +141,7 @@ const deleteFun = async (row: any) => {
    if (res && res.code === 200) {
      baseTableRef.value.resetFun();
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 const beforeUploadFun = (file: any) => {
--- a/src/components/taskDetail/taskCurve.vue
+++ b/src/components/taskDetail/taskCurve.vue
@@ -163,9 +163,7 @@ const deleteFun = async (row: any) => {
    if (res && res.code === 200) {
      baseTableRef.value.resetFun();
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 const showTableDataCurveFun = () => {
--- a/src/components/taskDetail/taskModel.vue
+++ b/src/components/taskDetail/taskModel.vue
@@ -141,9 +141,7 @@ const deleteFun = async (row: any) => {
    if (res && res.code === 200) {
      baseTableRef.value.resetFun();
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 const beforeUploadFun = (file: any) => {
--- a/src/components/taskDetail/taskReport.vue
+++ b/src/components/taskDetail/taskReport.vue
@@ -151,9 +151,7 @@ const deleteFun = async (row: any) => {
    if (res && res.code === 200) {
      baseTableRef.value.resetFun();
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 const beforeUploadFun = (file: any) => {
--- a/src/tenants/lyric/views/project/project.ts
+++ b/src/tenants/lyric/views/project/project.ts
@@ -7,7 +7,6 @@ export const disposeAsyncPhase = async (phaseList: any[], currentProjectInfo: an
    return;
  }
  let needAsync = false;
-  console.log('phaseList', phaseList);
  if (currentProjectInfo.currentPhase) {
    needAsync = !phaseList.some((phase) => {
      return phase.label === currentProjectInfo.currentPhase;
--- a/src/tenants/lyric/views/task/components/createWorkTime.vue
+++ b/src/tenants/lyric/views/task/components/createWorkTime.vue
@@ -174,10 +174,6 @@ const visibleDialogFun = () => {
  editRowInfo.value = {};
  setWorkName();
  addOrEditVisible.value = true;
-  // console.log('tableFormRef.value', tableFormRef.value);
-  // nextTick(() => {
-  //   tableFormRef.value.resetFun();
-  // });
 };

 const tableFormRef = ref();
@@ -185,7 +181,6 @@ const tableFormRef = ref();
 const confirmFun = async () => {
  if (tableFormRef.value.validateFun()) {
    const form = tableFormRef.value.getFormDataFun();
-    console.log('form', form);
    if (isEdit.value) {
      const params = {
        id: form.id,
--- a/src/tenants/lyric/views/task/demand.vue
+++ b/src/tenants/lyric/views/task/demand.vue
@@ -40,7 +40,6 @@ const hideKeys = ref();
 * @param type
 */
 const changeFun = async (val: any) => {
-  console.log('val', val, demandRef.value.editFormInfo);
  if (val.type === 'form') {
    if (val.val.key === 'demandType') {
      const formData = demandRef.value.tableFormRef.getFormDataFun();
--- a/src/views/index/approvalPreview/components/deliverableFile.vue
+++ b/src/views/index/approvalPreview/components/deliverableFile.vue
@@ -74,8 +74,7 @@ const getTaskInfo = async (uuid: any) => {
    } else {
      return { uuid, status: 3 };
    }
-  } catch (error) {
-    console.log(error);
+  } catch {
    return { uuid, status: 3 };
  }
 };
--- a/src/views/simulation/creation/components/attributeConfig.vue
+++ b/src/views/simulation/creation/components/attributeConfig.vue
@@ -493,9 +493,7 @@ const getAppConfigListFun = async (uuid: any) => {
    if (res && res.code === 200) {
      nodeParamOptions.value = res.data;
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 const showAppInfoVisible = ref(false);
--- a/src/views/simulation/creation/components/pageConfig/index.vue
+++ b/src/views/simulation/creation/components/pageConfig/index.vue
@@ -217,9 +217,8 @@ const getAppConfigListFun = async (uuid: any, name: any) => {
    } else {
      return [];
    }
-  } catch (error) {
+  } catch {
    return [];
-    console.log(error);
  }
 };

--- a/src/views/simulation/reportLib/components/addDialog.vue
+++ b/src/views/simulation/reportLib/components/addDialog.vue
@@ -96,12 +96,9 @@ const emits = defineEmits(['update:showDialog', 'confirm']);
 // });

 const confirmFun = async (type: string) => {
-  console.log('tableFormRef.value', tableFormRef.value, await tableFormRef.value.validateFun());
  if (await tableFormRef.value.validateFun()) {
    loadingInterface.value = true;
    const flowForm = tableFormRef.value.getFormDataFun();
-    console.log('flowForm', flowForm);
-    console.log('editRowInfo.value', editRowInfo.value);
    if (
      props.dialogType === REPORT_OPERATION_TYPE.CREATE ||
      props.dialogType === REPORT_OPERATION_TYPE.COPY
@@ -114,7 +111,6 @@ const confirmFun = async (type: string) => {
            formData.append('copyFlag', 'Y');
            formData.append('fileId', flowForm.fileId);
          } else {
-            console.log('flowForm[key]', flowForm[key]);
            formData.append(key, flowForm[key][0].raw);
          }
        } else {
@@ -133,7 +129,6 @@ const confirmFun = async (type: string) => {
      const flowUuid = await createFlow(formData);
      emits('confirm', { type, uuid: flowUuid });
    } else if (props.dialogType === REPORT_OPERATION_TYPE.UPGRADE) {
-      console.log('editRowInfo.value', editRowInfo.value);
      emits('confirm', {
        type,
        uuid: flowForm.uuid,
@@ -142,7 +137,6 @@ const confirmFun = async (type: string) => {
        fileId: flowForm.file[0].id,
      });
    } else {
-      // console.log('编辑项目', projectForm);
      await editReport(flowForm);
      emits('confirm', { type, uuid: flowForm.uuid });
    }
@@ -151,13 +145,10 @@ const confirmFun = async (type: string) => {
 };

 const createFlow = async (params: any) => {
-  // console.log('projectForm', projectForm);
  // const memberList = projectForm.memberList.map((item: any) => {
  //   return JSON.parse(item);
  // });
-  console.log('projectForm', tableFormRef.value.getFormDataFun());
  // const projectForm = tableFormRef.value.getFormDataFun();
-
  // const tagKeyMap = getTagKeyMap();
  const res: any = await createReportTemplateApi(params);
  if (res && res.code === 200) {
@@ -170,12 +161,9 @@ const createFlow = async (params: any) => {
 };

 const editReport = async (params: any) => {
-  console.log('oldFormData', oldFormData.value);
-  console.log('json', JSON.stringify(oldFormData.value) === JSON.stringify(params));
  let editFlag = false;
  for (const key in oldFormData.value) {
    if (oldFormData.value[key] !== params[key]) {
-      console.log('oldFormData.value[key]', key, oldFormData.value[key], params[key]);
      editFlag = true;
      break;
    }
@@ -203,7 +191,6 @@ const editReport = async (params: any) => {
        formData.append('file', params.file[0].raw);
      }
    }
-    console.log('formData', formData.get('file'));
    const res: any = await updateReportTemplateApi(formData);
    if (res && res.code === 200) {
      ElMessage.success(res.message);
@@ -217,7 +204,6 @@ const editReport = async (params: any) => {
 };

 const closeFun = () => {
-  console.log('关闭弹窗');
  emits('update:showDialog', false);
 };

@@ -232,7 +218,6 @@ const oldFormData = ref<any>({});
 const editRowInfo = ref<any>({});

 const setEditForm = (val: any) => {
-  console.log('val', val, tableFormRef.value);
  oldFormData.value = val;
  // nextTick(() => {
  simulationPoolInfoList.value = val.simulationPoolInfoList || [];
@@ -255,7 +240,6 @@ const resetForm = () => {
 };

 const setOptionsFun = (key: string, options: any[]) => {
-  console.log('key options', key, options);
  tableFormRef.value.setOptionsFun(key, options);
 };

@@ -267,12 +251,10 @@ watch(
      props.dialogType === REPORT_OPERATION_TYPE.UPGRADE ||
      props.dialogType === REPORT_OPERATION_TYPE.COPY
    ) {
-      console.log('editRowInfo.value', editRowInfo.value);
      const fileInfo: any = await getFileBaseInfoApi({ fileId: editRowInfo.value.fileId });
      editRowInfo.value.file = [
        { name: fileInfo.data.originalName, size: fileInfo.data.fileSize, id: fileInfo.data.id },
      ];
-      console.log('editRowInfo.value.file', editRowInfo.value.file);
    }
  }
 );
--- a/src/views/simulation/reportLib/index.vue
+++ b/src/views/simulation/reportLib/index.vue
@@ -335,7 +335,6 @@ const searchParams = computed(() => {
 const openDiaFun = (tag: REPORT_OPERATION_TYPE, row?: any) => {
  dialogType.value = tag;
  showDialog.value = true;
-  console.log('addDiaRef.value', addDiaRef.value);
  if (tag === REPORT_OPERATION_TYPE.CREATE) {
    // nextTick(() => {
    addDiaRef.value.resetForm();
--- a/src/views/system/application/components/addConfigParam.vue
+++ b/src/views/system/application/components/addConfigParam.vue
@@ -54,7 +54,6 @@ const submitFun = async () => {
  // }

  const fromData: any = pageConfigRef.value.drawingList || [];
-  console.log(fromData, 'fromData');

  let result: any = false;

--- a/src/views/system/application/components/appConfigPage.vue
+++ b/src/views/system/application/components/appConfigPage.vue
@@ -211,8 +211,6 @@ const pageType = ref('add');
 const openAddParamFun = () => {
  appConfigParamVisible.value = true;

-  console.log(currentConfigInfo.value, 'configInfo');
-
  if (currentConfigInfo.value?.configValue?.length) {
    pageType.value = 'edit';
  } else {
--- a/src/views/task/execution/components/runDetailPage/index.vue
+++ b/src/views/task/execution/components/runDetailPage/index.vue
@@ -321,7 +321,6 @@ import {
 } from '@/api/project/run';
 import {
  checklocalresourceApi,
-  execApi,
  getdeviceuuidApi,
  startupPlugin,
  submittaskApi,
@@ -380,8 +379,6 @@ const changeCurrentFlowNodeFun = (info: any) => {
  refreshPage.value = false;
  const { node, data, process }: any = info;

-  console.log(info, 'infoinfoinfo');
-
  flowNode.value = node;
  flowNodeData.value = data;
  // nodeParamDataList.value = flowNode.value?.store?.data?.data?.pageConfigList || [];
@@ -418,11 +415,6 @@ const updateFlowPageParamListFun = (data: any) => {
  pageUserParam.value = param;
  pageNodeDatas.value = nodeDatas;
  pageFlowNodeInfos.value = flowNodeInfos;
-  console.log(nodeDatas, 'nodeDatas');
-  console.log(flowNodeInfos, 'flowNodeInfos');
-  console.log(list, 'list');
-  console.log(param, 'param');
-
  for (const key in pageParamInfo.value) {
    resetTableDataFun(pageUserParam.value[key], pageParamInfo.value[key]);
  }
@@ -758,8 +750,7 @@ const getNodeFileIdAndNames = async () => {
        taskCmdParam,
      };
    }
-  } catch (error) {
-    console.log(error, 'error');
+  } catch {
    return {
      fileIds,
      fileNames,
@@ -780,8 +771,7 @@ const getfileTypeList = async () => {
    } else {
      return {};
    }
-  } catch (error) {
-    console.log(error);
+  } catch {
    return {};
  }
 };
--- a/src/views/task/projectDetail/components/loadcase.vue
+++ b/src/views/task/projectDetail/components/loadcase.vue
@@ -201,7 +201,6 @@ const getTaskTreeList = async () => {

 const phaseListOptions = ref<any[]>([]);
 const getPhaseListApi = async () => {
-  // console.log('currentPhase', props.currentPhase, props);
  const res: any = await getChildrenNodeListApi({
    current: 1,
    size: 999,
--- a/src/views/task/projectList/components/taskDialog.vue
+++ b/src/views/task/projectList/components/taskDialog.vue
@@ -344,8 +344,7 @@ const leftProjectTableRef = ref();
 const leftCurrentProjectUuid = ref<string>('');
 const leftCurrentPhaseUuid = ref<string>('');

-const changeLeftProjectFun = async (data: any) => {
-  console.log('data', data);
+const changeLeftProjectFun = async () => {
  leftCurrentPhaseUuid.value = '';
  leftProjectTableDataList.value = [];
 };
@@ -718,12 +717,6 @@ const addOrEditTaskFun = async () => {
  loadingInterface.value = true;
  const { insertRecords, removeRecords, updateRecords }: any =
    await getRightVxeRef().getRecordset();
-  // console.log(
-  //   'insertRecords, removeRecords, updateRecords',
-  //   insertRecords,
-  //   removeRecords,
-  //   updateRecords
-  // );
  const insertList = cloneDeep(insertRecords).map((item: any) => {
    return {
      ...item,
--- a/src/views/task/projectList/index.vue
+++ b/src/views/task/projectList/index.vue
@@ -428,7 +428,6 @@ const shwoProjectsFun = () => {
  } else {
    ElMessage.warning('请选择一个或多个项目查看项目内容');
  }
-  console.log(projects, 'projects');
 };
 </script>

--- a/src/views/task/projectOverview/index.vue
+++ b/src/views/task/projectOverview/index.vue
@@ -551,9 +551,7 @@ const getTaskTreeListFun = async () => {
      });
      tableLoading.value = false;
    }
-  } catch (error) {
-    console.log(error);
-  }
+  } catch {}
 };

 // 格式化输入的数据信息
@@ -682,8 +680,6 @@ const expandTreeFun = async () => {
  //   default:
  //     break;
  // }
-
-  // console.log(expandRowKeys.value, 'expandRowKeys.value');
 };

 // 获取展开节点的uuid
--- a/src/views/task/simulationTask/components/demandTable.vue
+++ b/src/views/task/simulationTask/components/demandTable.vue
@@ -150,7 +150,6 @@ const demandInfo = reactive({
 });

 const changeFun = async (val: any, type: string) => {
-  console.log('changeFun changeFun');
  let optionRef: any;
  if (type === 'search') {
    optionRef = tableRef.value;
--- a/src/views/task/simulationTask/confirmTask/components/batchSendTask.vue
+++ b/src/views/task/simulationTask/confirmTask/components/batchSendTask.vue
@@ -397,8 +397,6 @@ const queryPoolListFun = async () => {
      const newCheckedInfo: any = { ...checkedDemandList.value[index], ...poolInfo };
      checkedDemandList.value[index] = newCheckedInfo;
    }
-
-    console.log('poolInfo', poolInfo);
  }
 };
 const getIndexTreeData = async (info: any) => {
--- a/src/views/task/simulationTask/newDemand/index.vue
+++ b/src/views/task/simulationTask/newDemand/index.vue
@@ -226,7 +226,6 @@ const confirmFun = async () => {
  if (await tableFormRef.value.validateFun()) {
    loadingInterface.value = true;
    const fromData: any = tableFormRef.value.getFormDataFun();
-    console.log('fromData', fromData);
    if (fromData.planTime) {
      fromData.beginTime = fromData.planTime[0];
      fromData.endTime = fromData.planTime[1];
@@ -384,7 +383,6 @@ const changeFun = async (val: any, type: string) => {
    }
    editFormInfo.value = { ...formData };
  }
-  console.log('changeFun');
  emits('changeForm', { val, type });
 };