diff --git a/src/api/advance-boot/assess.ts b/src/api/advance-boot/assess.ts index 1a9ad888..d42e73e9 100644 --- a/src/api/advance-boot/assess.ts +++ b/src/api/advance-boot/assess.ts @@ -366,7 +366,7 @@ export function exportResult(data: any, assessId?: string | number) { } -//评估 +//导入评估 export const evaluation = (assessId: string, file: File) => { const formData = new FormData() formData.append('assessId', assessId) @@ -380,4 +380,16 @@ export const evaluation = (assessId: string, file: File) => { 'Content-Type': 'multipart/form-data' } }) - } \ No newline at end of file + } + +//直接评估 + + + //下载模板 + export const downloadAssessTemplate = () => { + return createAxios({ + url: '/advance-boot/secondaryEvaluation/downTemplateAssessResult', + method: 'get', + responseType: 'blob' + }) +} \ No newline at end of file diff --git a/src/views/pqs/runManage/assessment/components/assess/assessTemplate.vue b/src/views/pqs/runManage/assessment/components/assess/assessTemplate.vue new file mode 100644 index 00000000..9d075e08 --- /dev/null +++ b/src/views/pqs/runManage/assessment/components/assess/assessTemplate.vue @@ -0,0 +1,139 @@ + + + + + + + + 选择数据文件 + + + + + + + + 取消 + 评估 + + + + + + + + diff --git a/src/views/pqs/runManage/assessment/components/assess/index.vue b/src/views/pqs/runManage/assessment/components/assess/index.vue index 96d433a8..afce0af0 100644 --- a/src/views/pqs/runManage/assessment/components/assess/index.vue +++ b/src/views/pqs/runManage/assessment/components/assess/index.vue @@ -1,57 +1,50 @@ - - - - - - - - 导入数据背景 - - - 评估 - 导出报告 - - - - - - - - 加载中... - - infoLoading = false" /> - - - - - + + + + + + + + 模版下载 + 导入数据背景 + 评估 + 导出报告 + + + + + + 加载中... - outcomeLoading = false" /> - - - - - - - + infoLoading = false" /> + + + + + + + 加载中... + + outcomeLoading = false" /> + + + + + + + + + + diff --git a/src/views/pqs/runManage/assessment/components/uese/tabFrom.vue b/src/views/pqs/runManage/assessment/components/uese/tabFrom.vue index c1cd0983..0bece30d 100644 --- a/src/views/pqs/runManage/assessment/components/uese/tabFrom.vue +++ b/src/views/pqs/runManage/assessment/components/uese/tabFrom.vue @@ -393,8 +393,12 @@ const typeId = ref(null) // 过滤数据 const formatter = (row: any) => { if (row.column.field == 'transtypeId') { - const found = transformer.value.find((item: any) => item.transtypeId == row.cellValue) - return found.transtypeName || '' // 使用可选链并提供默认值 + if (row.cellValue) { + const found = transformer.value.find((item: any) => item.transtypeId == row.cellValue) + return found?.transtypeName || '' + } else { + return '' // 或者返回默认值 + } }else if(row.column.field =='inpactloadtypeId'){ const found = shockRef.value.find((item: any) => item.inpactloadtypeId == row.cellValue) typeId.value = found.inpactloadtypeId