Merge remote-tracking branch 'origin/master'

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)
                 // 找到录波项目并更新其状态

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({
+        }else{
-            planId: checkStore.plan.id,
+            await generateDevReport({
-            devIdList: [row.id],
+                    planId: checkStore.plan.id,
-            scriptId: checkStore.plan.scriptId,
+                    devIdList: [row.id],
-            planCode: checkStore.plan.code + '',
+                    scriptId: checkStore.plan.scriptId,
-            pageNum: 1,
+                    planCode: checkStore.plan.code + '',
-            pageSize: 999
+                    pageNum: 1,
-        })
+                    pageSize: 999
-        emit('batchGenerateClicked') // 触发事件
+            })
-        ElMessage.success({ message: `报告生成成功！` })*/
+            emit('batchGenerateClicked') // 触发事件
+            ElMessage.success({ message: `报告生成成功！` })
+        }
     }
 
     if (title === '报告下载') {

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="请输入实时数据有效组数"
                                         />
                                     </el-form-item>