diff --git a/frontend/src/views/home/components/selectTestItemPopup.vue b/frontend/src/views/home/components/selectTestItemPopup.vue index aadac2e..1bac322 100644 --- a/frontend/src/views/home/components/selectTestItemPopup.vue +++ b/frontend/src/views/home/components/selectTestItemPopup.vue @@ -90,6 +90,7 @@ const handleStart = () => { checkStore.setCheckType(0) checkStore.setSelectTestItems({...formContent}) handleClose() + emit('openTestDialog',checkStore.selectTestItems.test) } } diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 5ee39c4..f736617 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -1023,7 +1023,7 @@ const handleTest = async (val: string) => { if(appSceneStore.currentScene === '0'){ writeTHPopupRef.value?.open() }else{ - openTestDialog() + openTestDialog(true) } }) .catch((action: Action) => { @@ -1034,13 +1034,13 @@ const handleTest = async (val: string) => { if (appSceneStore.currentScene === '0') { writeTHPopupRef.value?.open() } else { - openTestDialog() + openTestDialog(true) } } }) checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true}) } else { - openTestDialog() + openTestDialog(true) } } } @@ -1084,15 +1084,20 @@ const handleTest = async (val: string) => { } } -const openTestDialog = () => { +const openTestDialog = (testData:any) => { if (appSceneStore.currentScene === '0') { - writeTHPopupRef.value?.open() + if(testData) + writeTHPopupRef.value?.open() + else + testPopup.value?.open(dialogTitle.value) } else { testPopup.value?.open(dialogTitle.value) } } + + const openTestDialog2 = () => { testPopup.value?.open(dialogTitle.value) }