diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue index fbfd49c..38432c9 100644 --- a/frontend/src/views/home/components/compareTest.vue +++ b/frontend/src/views/home/components/compareTest.vue @@ -313,7 +313,7 @@ watch( break case 25001: { // 当录波校验完成时,更新录波项目的按钮状态 - setLogList('info', '录波对齐完成!') + setLogList('info', '录波校验完成!') // 解析返回的数据 const waveData = JSON.parse(newValue.data) // 找到录波项目并更新其状态 diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 7573bb5..ccf7383 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -225,6 +225,7 @@ import { documentedPqDev } from '@/api/device/report' import { ResultEnum } from '@/enums/httpEnum' import { getPqMonList } from '@/api/device/monitor/index.ts' import ReportResultPopup from '@/views/home/components/reportResultPopup.vue' +import { el } from 'element-plus/es/locale' const checkStore = useCheckStore() let devNum = 0 //当前选取的被检设备数量 @@ -995,17 +996,20 @@ const openTestDialog2 = () => { const openDrawer = async (title: string, row: any) => { // 单个设备报告生成 if (title === '报告生成') { + if (modeStore.currentMode == '比对式'){ reportPopup.value?.open(row) - /*await generateDevReport({ - planId: checkStore.plan.id, - devIdList: [row.id], - scriptId: checkStore.plan.scriptId, - planCode: checkStore.plan.code + '', - pageNum: 1, - pageSize: 999 - }) - emit('batchGenerateClicked') // 触发事件 - ElMessage.success({ message: `报告生成成功!` })*/ + }else{ + await generateDevReport({ + planId: checkStore.plan.id, + devIdList: [row.id], + scriptId: checkStore.plan.scriptId, + planCode: checkStore.plan.code + '', + pageNum: 1, + pageSize: 999 + }) + emit('batchGenerateClicked') // 触发事件 + ElMessage.success({ message: `报告生成成功!` }) + } } if (title === '报告下载') { diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue index 74f7b4e..63aea11 100644 --- a/frontend/src/views/plan/planList/components/planPopup.vue +++ b/frontend/src/views/plan/planList/components/planPopup.vue @@ -319,7 +319,7 @@ v-model="formContent.testConfig!.realTime" :precision="0" :step="1" - :min="1" + :min="40" placeholder="请输入实时数据有效组数" />