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

eslint

Browse Source
This commit is contained in:
lijing1
2025-12-11 10:15:56 +08:00
parent 74d33b8f0d
commit 9776e2ba00
7 changed files with 146 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/common/dialog/index.vue
View File

@@ -2,12 +2,13 @@
<div class="comp-content"> <div class="comp-content">
<el-dialog <el-dialog
:title="diaTitle" :title="diaTitle"
@open="openFun"
draggable draggable
:close-on-click-modal="false"
append-to-body append-to-body
v-bind="$attrs" v-bind="$attrs"
@open="openFun"
> >
<template v-for="(name) in Object.keys($slots)" :key="name" #[name]="scope"> <template v-for="name in Object.keys($slots)" :key="name" #[name]="scope">
<slot :name="name" v-bind="scope" /> <slot :name="name" v-bind="scope" />
</template> </template>
</el-dialog> </el-dialog>
@@ -34,7 +35,8 @@ withDefaults(defineProps<Props>(), {
}); });
const emit = defineEmits(['show']); const emit = defineEmits(['show']);
const openFun = () => { // 兼容vxe-modal const openFun = () => {
// 兼容vxe-modal
emit('show'); emit('show');
}; };
</script> </script>

103
src/components/flow/flowNodeParamTable.vue
View File

@@ -170,7 +170,7 @@ const props = defineProps({
}, },
runInfo: { runInfo: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
}); });
@@ -214,12 +214,9 @@ const saveNodeParamFun = async () => {
}; };
const setDataToParam = async (list: any, obj: any, isUpload?: any) => { const setDataToParam = async (list: any, obj: any, isUpload?: any) => {
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
if (list[i].englishLabel) { if (list[i].englishLabel) {
if (list[i].tagType === WIDGET_TYPE.FILE && list[i]?.fileList?.length) { if (list[i].tagType === WIDGET_TYPE.FILE && list[i]?.fileList?.length) {
const fileList = list[i]?.fileList; const fileList = list[i]?.fileList;
const arrs: any = []; const arrs: any = [];
for (let j = 0; j < fileList.length; j++) { for (let j = 0; j < fileList.length; j++) {
@@ -245,31 +242,33 @@ const uploadRunFilesFun = async (file: any) => {
fileType: 1, fileType: 1,
}; };
await uploadRunFilesApi(param).then(async (res: any) => { await uploadRunFilesApi(param)
if (res.code === 200) { .then(async (res: any) => {
if (res.code === 200) {
return {
fileName: name,
};
}
})
.finally(() => {
return { return {
fileName: name, fileName: name,
}; };
} });
}).finally(() => {
return {
fileName: name,
};
});
}; };
const getFileNameList = (list: any) => { const getFileNameList = (list: any) => {
let names: any = ''; let names: any = '';
if (list?.length) { if (list?.length) {
names = list.map((item: any) => { names = list
return item.fileName; .map((item: any) => {
}).join(','); return item.fileName;
})
.join(',');
} }
return names; return names;
}; };
// 参数入库 // 参数入库
@@ -287,7 +286,6 @@ const paramToLibFun = async () => {
}); });
parameterArchiveVisible.value = true; parameterArchiveVisible.value = true;
}; };
// //
@@ -296,7 +294,6 @@ const referenceParamFun = () => {
}; };
const updateParamInfoFun = (data: any) => { const updateParamInfoFun = (data: any) => {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
for (let j = 0; j < tableData.value.length; j++) { for (let j = 0; j < tableData.value.length; j++) {
if (data[i].parameterName === tableData.value[j].englishLabel) { if (data[i].parameterName === tableData.value[j].englishLabel) {
@@ -309,7 +306,7 @@ const updateParamInfoFun = (data: any) => {
// 设置特殊的参数信息 // 设置特殊的参数信息
const setSpecialParamData = (param: any) => { const setSpecialParamData = (param: any) => {
console.log(props.runInfo); console.log(props.runInfo);
param.taskId = props.runInfo.taskId; param.taskId = props.runInfo.taskId;
param.taskName = props.runInfo.parentName; param.taskName = props.runInfo.parentName;
@@ -319,44 +316,44 @@ console.log(props.runInfo);
param.software = '电池仿真'; param.software = '电池仿真';
}; };
watch(() => props.nodeParams, (newVal) => { watch(
if (newVal) { () => props.nodeParams,
// const paramData = nodeParamData.value?.pageConfigList || []; (newVal) => {
tableData.value = cloneDeep(newVal); if (newVal) {
// const paramData = nodeParamData.value?.pageConfigList || [];
for (let i = 0; i < tableData.value.length; i++) { tableData.value = cloneDeep(newVal);
if (tableData.value[i].englishLabel === 'jobName') {
tableData.value[i].defaultValue = '测试任务' + new Date().getTime();
}
}
formatDataFun(tableData.value, 0);
if (props.pageInfo) {
const saveParam: any = props.pageInfo?.userParams || '';
if (saveParam) {
for (let i = 0; i < tableData.value.length; i++) {
for (const key in saveParam) {
if (tableData.value[i].englishLabel === key) {
tableData.value[i].defaultValue = saveParam[key];
}
}
for (let i = 0; i < tableData.value.length; i++) {
if (tableData.value[i].englishLabel === 'jobName') {
tableData.value[i].defaultValue = '测试任务' + new Date().getTime();
} }
} }
}
nextTick(() => { formatDataFun(tableData.value, 0);
baseTableRef.value.setDataFun(tableData.value);
}); if (props.pageInfo) {
const saveParam: any = props.pageInfo?.userParams || '';
if (saveParam) {
for (let i = 0; i < tableData.value.length; i++) {
for (const key in saveParam) {
if (tableData.value[i].englishLabel === key) {
tableData.value[i].defaultValue = saveParam[key];
}
}
}
}
}
nextTick(() => {
baseTableRef.value.setDataFun(tableData.value);
});
}
},
{
immediate: true,
deep: true,
} }
}, {
immediate: true,
deep: true,
}
); );
</script> </script>

57
src/components/taskDetail/taskInfo.vue
View File

@@ -11,7 +11,7 @@
<flowTemplateSelect v-model="selectedFlowTemplate" /> <flowTemplateSelect v-model="selectedFlowTemplate" />
</template> </template>
<template #form-standard> <template #form-standard>
<knowledgeSelect v-model="standard"/> <knowledgeSelect v-model="standard" />
</template> </template>
</TableForm> </TableForm>
</div> </div>
@@ -29,7 +29,7 @@ import { disposeTagKey } from '@/views/task/projectDetail/components/project';
const props = defineProps({ const props = defineProps({
taskInfo: { taskInfo: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
tableName: { tableName: {
type: String, type: String,
@@ -63,32 +63,38 @@ const ruleData = ref<any>({
return true; return true;
}, },
}, },
], ],
}); });
// 流程模板相关 // 流程模板相关
const selectedFlowTemplate = ref<any>(null); const selectedFlowTemplate = ref<any>(null);
const standard = ref(); const standard = ref();
watch(() => props.taskInfo, (newVal) => { watch(
if (newVal) { () => props.taskInfo,
localDetail.value = newVal; (newVal) => {
if (newVal) {
localDetail.value = newVal;
console.log(localDetail.value, 'localDetail.value'); console.log(localDetail.value, 'localDetail.value');
nextTick(() => { nextTick(() => {
tableFormRef.value?.setFormDataFun({ ...localDetail.value, eMemberList: getMemberListIds(localDetail.value.eMemberList), pMemberList: getMemberListIds(localDetail.value.pMemberList) }); tableFormRef.value?.setFormDataFun({
standard.value = localDetail.value.standard; ...localDetail.value,
if (localDetail.value.flowTemplate) { eMemberList: getMemberListIds(localDetail.value.eMemberList),
selectedFlowTemplate.value = localDetail.value.flowTemplate; pMemberList: getMemberListIds(localDetail.value.pMemberList),
} });
}); standard.value = localDetail.value.standard;
if (localDetail.value.flowTemplate) {
selectedFlowTemplate.value = localDetail.value.flowTemplate;
}
});
}
},
{
immediate: true,
deep: true,
} }
);
}, {
immediate: true,
deep: true,
});
const getFormData = async () => { const getFormData = async () => {
const valid = await tableFormRef.value?.validateFun(); const valid = await tableFormRef.value?.validateFun();
@@ -101,7 +107,11 @@ const getFormData = async () => {
formData.flowTemplate = selectedFlowTemplate.value; formData.flowTemplate = selectedFlowTemplate.value;
} }
if (localDetail.value?.tagKeyList) { if (localDetail.value?.tagKeyList) {
const tagKeyList = disposeTagKey(formData, localDetail.value?.tagKeyList || [], getTagKeyMap()); const tagKeyList = disposeTagKey(
formData,
localDetail.value?.tagKeyList || [],
getTagKeyMap()
);
console.log('tagKeyList', tagKeyList); console.log('tagKeyList', tagKeyList);
} else { } else {
formData.tagKeyList = []; formData.tagKeyList = [];
@@ -121,20 +131,16 @@ const getFormData = async () => {
} }
return formData; return formData;
} else { } else {
return null; return null;
} }
}; };
defineExpose({ defineExpose({
getFormData, getFormData,
}); });
onMounted(() => { onMounted(() => {});
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@@ -152,6 +158,5 @@ onMounted(() => {
margin-bottom: 18px !important; margin-bottom: 18px !important;
} }
} }
} }
</style> </style>

12
src/utils/enum/task.ts
View File

@@ -15,7 +15,7 @@ export enum TASK_PROCESS_STATUS {
/** 已延期 */ /** 已延期 */
POSTPONED = '7', POSTPONED = '7',
} }
export const TASK_PROCESS_STATUS_OBJ:any = { export const TASK_PROCESS_STATUS_OBJ: any = {
[TASK_PROCESS_STATUS.REJECTED]: '已驳回', [TASK_PROCESS_STATUS.REJECTED]: '已驳回',
[TASK_PROCESS_STATUS.NO_STARTED]: '未开始', [TASK_PROCESS_STATUS.NO_STARTED]: '未开始',
[TASK_PROCESS_STATUS.IN_PROGRESS]: '进行中', [TASK_PROCESS_STATUS.IN_PROGRESS]: '进行中',
@@ -24,7 +24,9 @@ export const TASK_PROCESS_STATUS_OBJ:any = {
[TASK_PROCESS_STATUS.CLOSED]: '已关闭', [TASK_PROCESS_STATUS.CLOSED]: '已关闭',
}; };
export const TASK_PROCESS_STATUS_OPTIONS = (Object.keys(TASK_PROCESS_STATUS_OBJ) as Array<keyof typeof TASK_PROCESS_STATUS_OBJ>).map((key) => { export const TASK_PROCESS_STATUS_OPTIONS = (
Object.keys(TASK_PROCESS_STATUS_OBJ) as Array<keyof typeof TASK_PROCESS_STATUS_OBJ>
).map((key) => {
return { return {
label: TASK_PROCESS_STATUS_OBJ[key], label: TASK_PROCESS_STATUS_OBJ[key],
value: key, value: key,
@@ -42,14 +44,16 @@ export enum TASK_CALCULATE_STATUS {
/** 临界 */ /** 临界 */
// CRITICAL = '3', // CRITICAL = '3',
} }
export const TASK_CALCULATE_STATUS_OBJ:any = { export const TASK_CALCULATE_STATUS_OBJ: any = {
[TASK_CALCULATE_STATUS.NO_CALCULATE]: '未分析', [TASK_CALCULATE_STATUS.NO_CALCULATE]: '未分析',
[TASK_CALCULATE_STATUS.QUALIFIED]: '合格', [TASK_CALCULATE_STATUS.QUALIFIED]: '合格',
[TASK_CALCULATE_STATUS.UNQUALIFIED]: '不合格', [TASK_CALCULATE_STATUS.UNQUALIFIED]: '不合格',
// [TASK_CALCULATE_STATUS.CRITICAL]: '临界', // [TASK_CALCULATE_STATUS.CRITICAL]: '临界',
}; };
export const TASK_CALCULATE_STATUS_OPTIONS = (Object.keys(TASK_CALCULATE_STATUS_OBJ) as Array<keyof typeof TASK_CALCULATE_STATUS_OBJ>).map((key) => { export const TASK_CALCULATE_STATUS_OPTIONS = (
Object.keys(TASK_CALCULATE_STATUS_OBJ) as Array<keyof typeof TASK_CALCULATE_STATUS_OBJ>
).map((key) => {
return { return {
label: TASK_CALCULATE_STATUS_OBJ[key], label: TASK_CALCULATE_STATUS_OBJ[key],
value: key, value: key,

15
src/utils/task.ts
View File

@@ -2,9 +2,9 @@ import { cloneDeep } from 'lodash-es';
import { useDict } from './useDict'; import { useDict } from './useDict';
import { getTagKeyMap } from './enum/node'; import { getTagKeyMap } from './enum/node';
export const disposeSimType = (demandType: string, simType:string) => { export const disposeSimType = (demandType: string, simType: string) => {
if (demandType && simType) { if (demandType && simType) {
const dict:any = useDict(demandType); const dict: any = useDict(demandType);
if (dict[demandType].value.O[simType]) { if (dict[demandType].value.O[simType]) {
return dict[demandType].value.O[simType]; return dict[demandType].value.O[simType];
} }
@@ -20,16 +20,18 @@ export const disposeSimType = (demandType: string, simType:string) => {
export const getMemberListIds = (memberList: any[]) => { export const getMemberListIds = (memberList: any[]) => {
const list = cloneDeep(memberList); const list = cloneDeep(memberList);
if (Array.isArray(list)) { if (Array.isArray(list)) {
return list.map((item:any) => { return list
return item.userId; .map((item: any) => {
}).join(','); return item.userId;
})
.join(',');
} }
return ''; return '';
}; };
export const getTagMapList = () => { export const getTagMapList = () => {
const tagMap = getTagKeyMap(); const tagMap = getTagKeyMap();
const tagMapList: { key: string; value: string; }[] = []; const tagMapList: { key: string; value: string }[] = [];
tagMap.forEach((value: string, key: string) => { tagMap.forEach((value: string, key: string) => {
tagMapList.push({ tagMapList.push({
key: key, key: key,
@@ -38,4 +40,3 @@ export const getTagMapList = () => {
}); });
return tagMapList; return tagMapList;
}; };

8
src/views/simulation/process/index.vue
View File

@@ -32,10 +32,10 @@
flow.approveType === FLOW_APPROVE_STATUS_ENUM.NOT_APPROVED flow.approveType === FLOW_APPROVE_STATUS_ENUM.NOT_APPROVED
? 'approve-box no-approve' ? 'approve-box no-approve'
: flow.approveType === FLOW_APPROVE_STATUS_ENUM.APPROVING : flow.approveType === FLOW_APPROVE_STATUS_ENUM.APPROVING
? 'approve-box approving' ? 'approve-box approving'
: flow.approveType === FLOW_APPROVE_STATUS_ENUM.APPROVED : flow.approveType === FLOW_APPROVE_STATUS_ENUM.APPROVED
? 'approve-box approve-success' ? 'approve-box approve-success'
: 'approve-box approve-refuse' : 'approve-box approve-refuse'
" "
> >
{{ FLOW_APPROVE_STATUS.O[flow.approveType] }} {{ FLOW_APPROVE_STATUS.O[flow.approveType] }}

51
src/views/task/projectDetail/components/taskDetail.vue
View File

@@ -1,10 +1,24 @@
<template> <template>
<div class="comp-content"> <div class="comp-content">
<Dialog v-model="dialogVisible" diaTitle="任务详情" :width="'70%'" :height="700" @close="closeFun" show-footer :zIndex="100"> <Dialog
v-model="dialogVisible"
diaTitle="任务详情"
:width="'70%'"
:height="700"
@close="closeFun"
show-footer
:zIndex="100"
>
<el-tabs v-model="activeTab"> <el-tabs v-model="activeTab">
<el-tab-pane label="任务详情" name="info" v-if="showTaskInfo"> <el-tab-pane label="任务详情" name="info" v-if="showTaskInfo">
<div class="task-tab-content"> <div class="task-tab-content">
<taskInfo ref="taskInfoRef" v-if="activeTab === 'info'" :table-name="tableName" :task-id="currentTaskInfo?.uuid" :task-info="currentTaskInfo"> <taskInfo
ref="taskInfoRef"
v-if="activeTab === 'info'"
:table-name="tableName"
:task-id="currentTaskInfo?.uuid"
:task-info="currentTaskInfo"
>
</taskInfo> </taskInfo>
</div> </div>
</el-tab-pane> </el-tab-pane>
@@ -15,18 +29,32 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="性能指标" name="performance"> <el-tab-pane label="性能指标" name="performance">
<div class="task-tab-content"> <div class="task-tab-content">
<taskPerformance ref="taskPerformanceRef" v-if="activeTab === 'performance'" :task-id="taskId" :param-type="'task'" :run-info="currentTaskInfo" :task-info="currentTaskInfo" :show-save-button="true"> <taskPerformance
ref="taskPerformanceRef"
v-if="activeTab === 'performance'"
:task-id="taskId"
:param-type="'task'"
:run-info="currentTaskInfo"
:task-info="currentTaskInfo"
:show-save-button="true"
>
</taskPerformance> </taskPerformance>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="结果图片" name="resultImage"> <el-tab-pane label="结果图片" name="resultImage">
<div class="task-tab-content"> <div class="task-tab-content">
<resultImage v-if="activeTab === 'resultImage'" :task-id="currentTaskInfo?.uuid"></resultImage> <resultImage
v-if="activeTab === 'resultImage'"
:task-id="currentTaskInfo?.uuid"
></resultImage>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="曲线查看" name="curveView"> <el-tab-pane label="曲线查看" name="curveView">
<div class="task-tab-content"> <div class="task-tab-content">
<taskCurve v-if="activeTab === 'curveView'" :task-id="currentTaskInfo?.uuid"></taskCurve> <taskCurve
v-if="activeTab === 'curveView'"
:task-id="currentTaskInfo?.uuid"
></taskCurve>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="仿真报告" name="report"> <el-tab-pane label="仿真报告" name="report">
@@ -36,10 +64,13 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="交付物" name="deliverables"> <el-tab-pane label="交付物" name="deliverables">
<div class="task-tab-content"> <div class="task-tab-content">
<taskDeliverable v-if="activeTab === 'deliverables'" :task-id="currentTaskInfo?.uuid" :task-info="currentTaskInfo"></taskDeliverable> <taskDeliverable
v-if="activeTab === 'deliverables'"
:task-id="currentTaskInfo?.uuid"
:task-info="currentTaskInfo"
></taskDeliverable>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<template #footer> <template #footer>
<div> <div>
@@ -70,7 +101,7 @@ const props = defineProps({
}, },
currentTaskInfo: { currentTaskInfo: {
type: Object, type: Object,
default: () => { }, default: () => {},
}, },
tableName: { tableName: {
type: String, type: String,
@@ -83,7 +114,7 @@ const props = defineProps({
}); });
const dialogVisible = ref(true); const dialogVisible = ref(true);
const activeTab = ref( props.showTaskInfo ? 'info' : 'model'); const activeTab = ref(props.showTaskInfo ? 'info' : 'model');
const taskPerformanceRef = ref(); const taskPerformanceRef = ref();
const taskInfoRef = ref(); const taskInfoRef = ref();
const closeFun = () => { const closeFun = () => {
@@ -91,7 +122,6 @@ const closeFun = () => {
}; };
const updateFun = async () => { const updateFun = async () => {
let data: any; let data: any;
if (activeTab.value === 'performance') { if (activeTab.value === 'performance') {
await taskPerformanceRef.value.saveFun(); await taskPerformanceRef.value.saveFun();
@@ -105,7 +135,6 @@ const updateFun = async () => {
flag: activeTab.value, flag: activeTab.value,
data, data,
}); });
}; };
</script> </script>