diff --git a/frontend/src/api/interface/index.ts b/frontend/src/api/interface/index.ts index c5e4867..1c08b51 100644 --- a/frontend/src/api/interface/index.ts +++ b/frontend/src/api/interface/index.ts @@ -24,8 +24,8 @@ export interface ResultData extends Result { * 分页请求参数 */ export interface ReqPage { - pageNum: number; - pageSize: number; + pageNum?: number; + pageSize?: number; } /** diff --git a/frontend/src/api/system/versionRegister/index.ts b/frontend/src/api/system/versionRegister/index.ts index a6043bd..dbe5dfe 100644 --- a/frontend/src/api/system/versionRegister/index.ts +++ b/frontend/src/api/system/versionRegister/index.ts @@ -3,7 +3,7 @@ import { type VersionRegister } from '@/api/system/versionRegister/interface' //获取有效数据配置 export const getRegRes = (params: { type: string }) => { - return http.get(`/sysRegRes/getRegResByType?id=${params.type}`) + return http.get(`/sysRegRes/getRegResByType?typeId=${params.type}`) } //编辑有效数据配置 diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue index 741f735..f027830 100644 --- a/frontend/src/views/home/components/compareTest.vue +++ b/frontend/src/views/home/components/compareTest.vue @@ -129,6 +129,7 @@ import {useCheckStore} from '@/stores/modules/check' import {ElMessage, ElMessageBox} from 'element-plus' import {getBigTestItem} from '@/api/check/test' import {getAutoGenerate} from '@/api/user/login' +import { generateDevReport } from '@/api/plan/plan' import {useModeStore} from '@/stores/modules/mode' // 引入模式 store import {useDictStore} from '@/stores/modules/dict' const checkStore = useCheckStore() @@ -668,19 +669,19 @@ const updatePercentage = async () => { percentage.value = 100 emit('update:testStatus', 'success') - let {data: autoGenerate} = await getAutoGenerate() + + // 检查是否需要自动生成报告 + let { data: autoGenerate } = await getAutoGenerate() if (autoGenerate == 1) { - //调用自动生成报告接口 + // 自动生成报告 let devIdList = checkStore.devices.map(item => { return item.deviceId }) - - // await generateDevReport({ - // planId: checkStore.plan.id, - // devIdList: devIdList, - // scriptId: checkStore.plan.scriptId, - // planCode: checkStore.plan.code + '' - // }) + await generateDevReport({ + 'planId': checkStore.plan.id, + 'devIdList': devIdList, + 'planCode': checkStore.plan.code + '' + }) } stopTimeCount(1) ElMessageBox.alert( diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index affc338..cdde362 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -1018,9 +1018,7 @@ const handleTest = async (val: string) => { planId: checkStore.plan.id, devIdList: devIdList, scriptId: checkStore.plan.scriptId, - planCode: checkStore.plan.code + '', - pageNum: 1, - pageSize: 999 + planCode: checkStore.plan.code + '' }) emit('batchGenerateClicked') // 触发事件 ElMessage.success({ message: `报告生成成功!` }) @@ -1060,9 +1058,7 @@ const openDrawer = async (title: string, row: any) => { planId: checkStore.plan.id, devIdList: [row.id], scriptId: checkStore.plan.scriptId, - planCode: checkStore.plan.code + '', - pageNum: 1, - pageSize: 999 + planCode: checkStore.plan.code + '' }) emit('batchGenerateClicked') // 触发事件 ElMessage.success({ message: `报告生成成功!` }) diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index c190e75..dff21f7 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -706,9 +706,7 @@ const updatePercentage = async () => { 'planId': checkStore.plan.id, 'devIdList': devIdList, 'scriptId': checkStore.plan.scriptId, - 'planCode': checkStore.plan.code + '', - 'pageNum': 1, - 'pageSize': 999, + 'planCode': checkStore.plan.code + '' }) } // 提示检测完成