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
2025-12-01 11:38:28 +08:00
parent 5cac99db19 3c814b344b
commit 27b7121ab3
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/stores/taskPool.ts
View File

@@ -36,7 +36,7 @@ export const useTaskStore = defineStore('task', () => {
templates.value = []; templates.value = [];
} }
loaded.value = true; loaded.value = true;
} catch (e) { } catch {
templates.value = []; templates.value = [];
loaded.value = true; loaded.value = true;
} }

8
src/utils/node.ts
View File

@@ -13,7 +13,7 @@ export const toMap = <T extends string | number, U>(list: { value: T, label: U }
export const flatNode = (arr: any) => { export const flatNode = (arr: any) => {
const data: any = []; const data: any = [];
const flat = (arr: any, parent?: null) => { const flat = (arr: any, parent?: any) => {
arr?.forEach((item: any) => { arr?.forEach((item: any) => {
item.parentId = parent?.fakeId || null; item.parentId = parent?.fakeId || null;
data.push(item); data.push(item);
@@ -66,7 +66,7 @@ export const traverseTree = <T extends TreeNode>(nodes: T[] | undefined, callbac
nodes.forEach((node) => { nodes.forEach((node) => {
callback(node, parent); callback(node, parent);
if (node.children && node.children.length > 0) { if (node.children && node.children.length > 0) {
traverseTree(node.children, callback, node); traverseTree(node.children as T[], callback, node);
} }
}); });
}; };
@@ -78,7 +78,7 @@ export const traverseTreeAsync = async<T extends TreeNode>(tree: T[] | undefined
for (const node of nodes) { for (const node of nodes) {
await callback(node, parent); await callback(node, parent);
if (Array.isArray(node.children)) { if (Array.isArray(node.children)) {
await traverseTreeAsync(node.children, callback, node); await traverseTreeAsync(node.children as T[], callback, node);
} }
} }
}; };
@@ -185,7 +185,7 @@ export const getNodeExtras = (node: TreeNode, extraPickMap: Record<string, strin
}; };
export const transformTreeToPoolNodes = (tree: TreeNode[]) => { export const transformTreeToPoolNodes = (tree: TreeNode[]) => {
traverseTree(tree, node => { traverseTree(tree, node => {
if (![NODE_TYPE.TASK, NODE_TYPE.PERFORMANCE].includes(node.nodeType)) { if (![NODE_TYPE.TASK, NODE_TYPE.PERFORMANCE].includes(node.nodeType as NODE_TYPE)) {
node.levelType = LEVEL_TYPE.NODE; node.levelType = LEVEL_TYPE.NODE;
} else { } else {
node.levelType = node.nodeType; node.levelType = node.nodeType;

2
src/views/competenceCenter/condition/components/taskPool.vue
View File

@@ -783,7 +783,7 @@ const calcMergeCellsFun = (tableData: any) => {
.map((c: any) => c.property || c.field || c.dataIndex || c.key || '') .map((c: any) => c.property || c.field || c.dataIndex || c.key || '')
.filter(Boolean); .filter(Boolean);
} }
} catch (e) { } catch {
throw new Error('获取表格列顺序失败'); throw new Error('获取表格列顺序失败');
} }

2
src/views/competenceCenter/knowledge/index.vue
View File

@@ -132,7 +132,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
import FileTree from '@/components/common/fileTree/index.vue'; import FileTree from '@/components/common/fileTree/index.vue';
import knowledgeDetailModal from './components/knowledgeDetailModal.vue'; import knowledgeDetailModal from './components/knowledgeDetailModal.vue';
import folderModal from './components/folderDetailModal.vue'; import folderModal from './components/folderDetailModal.vue';
import { dataCreateDirApi, dataListDirApi, dataRenameDirApi, dataUploadFilesApi, dataDelDirApi, dataQueryDirApi, dataFileSearchApi, dataDelFileApi, dataUpdateFileApi, batchAddFileInfoApi, dataExportKnowledgeListApi } from '@/api/data/data'; import { dataCreateDirApi, dataListDirApi, dataRenameDirApi, dataDelDirApi, dataQueryDirApi, dataFileSearchApi, dataDelFileApi, dataUpdateFileApi, batchAddFileInfoApi, dataExportKnowledgeListApi } from '@/api/data/data';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import type { RenderContentContext } from 'element-plus'; import type { RenderContentContext } from 'element-plus';
import { formatFileSize } from '@/utils/file'; import { formatFileSize } from '@/utils/file';

2
src/views/data/forecast/index.vue
View File

@@ -46,7 +46,7 @@
<div class="right"> <div class="right">
<BaseTable ref="outputTableRef" :tableName="TABLE_NAME.DATA_FORECAST_OUTPUT" showIndex :actionsWidth="200" hidePagination> <BaseTable ref="outputTableRef" :tableName="TABLE_NAME.DATA_FORECAST_OUTPUT" showIndex :actionsWidth="200" hidePagination>
<template #type> <template #type>
{{ $t('数据预测.输出') }} {{ $t('数据预测.输出') }}
</template> </template>
</BaseTable> </BaseTable>
</div> </div>

1
src/views/data/train/index.vue
View File

@@ -62,7 +62,6 @@
import { computed, nextTick, onMounted, reactive, ref } from 'vue'; import { computed, nextTick, onMounted, reactive, ref } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { getModelTrainingListApi, addModelApi, updateModelApi, delModelApi, exportTrainingListApi } from '@/api/data/dataForecast'; import { getModelTrainingListApi, addModelApi, updateModelApi, delModelApi, exportTrainingListApi } from '@/api/data/dataForecast';
import { tableActionsLength } from '@/utils/common';
import BaseTable from '@/components/common/table/baseTable.vue'; import BaseTable from '@/components/common/table/baseTable.vue';
import Dialog from '@/components/common/dialog/index.vue'; import Dialog from '@/components/common/dialog/index.vue';
import TableForm from '@/components/common/table/tableForm.vue'; import TableForm from '@/components/common/table/tableForm.vue';