diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index f736617..e5e88d9 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -956,20 +956,31 @@ const handleTest = async (val: string) => { }) .then(() => { ElMessage.success('不合格项复检') - if (checkStore.devices.length > 1) { - checkStore.setReCheckType(1) - } else { + // if (checkStore.devices.length > 1) { + // checkStore.setReCheckType(1) + // } else { checkStore.setReCheckType(0) + // } + //selectTestItemPopupRef.value?.open() + if(appSceneStore.currentScene === '0'){ + writeTHPopupRef.value?.open() + }else{ + openTestDialog(true) } - selectTestItemPopupRef.value?.open() }) .catch((action: Action) => { if(action === 'cancel'){ ElMessage.success('全部复检') checkStore.setReCheckType(1) - selectTestItemPopupRef.value?.open() + //selectTestItemPopupRef.value?.open() + if(appSceneStore.currentScene === '0'){ + writeTHPopupRef.value?.open() + }else{ + openTestDialog(true) + } } }) + checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true}) } else { checkStore.setReCheckType(1) @@ -1014,11 +1025,11 @@ const handleTest = async (val: string) => { }) .then(() => { ElMessage.success('不合格项复检') - if (checkStore.devices.length > 1) { - checkStore.setReCheckType(1) - } else { + // if (checkStore.devices.length > 1) { + // checkStore.setReCheckType(1) + // } else { checkStore.setReCheckType(0) - } + // } //openTestDialog(false) if(appSceneStore.currentScene === '0'){ writeTHPopupRef.value?.open()