diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 80e9b05..72a3370 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -110,7 +110,7 @@ -
@@ -603,7 +603,6 @@ const updateCheckResult = (data: CheckData.ScriptChnItem) => { const scrollToBottom = () => { if (scrollContainerRef.value) { scrollContainerRef.value.scrollTop = scrollContainerRef.value.scrollHeight; - console.log(scrollContainerRef.value.scrollTop) } }; diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 5c1bd6c..bb1c968 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -148,17 +148,18 @@ const detectionOptions = ref([ const preTestRef = ref(null); const testRef = ref(null); - const devIdArr = ref([]) - const planId = ref('') + // const devIdArr = ref([]) + // const planId = ref('') + // 打开弹窗,可能是新增,也可能是编辑 const open = (selection: Device.ResPqDev[],title: string,time:boolean) => { const checkStates = selection.map(item => item.checkState); - devIdArr.value = selection.map(item => item.id); - planId.value =selection[0].planId - console.log('wwwwwwwwwwwwwwwww',selection) + // devIdArr.value = selection.map(item => item.id); + // planId.value =selection[0].planId + // console.log('wwwwwwwwwwwwwwwww',selection) const allCheckStatesEqual = new Set(checkStates).size <= 1; @@ -213,7 +214,10 @@ const detectionOptions = ref([ const handleSubmit = () => { skipDisabled.value = true console.log('=============',stepsActiveIndex.value) + let deviceIds = checkStore.devices.map((item) => item.deviceId) + let planId = checkStore.planId + switch (stepsActiveIndex.value) { case 0: preTestStatus.value = 'start' @@ -226,8 +230,9 @@ const detectionOptions = ref([ })*/ startPreTest({ userPageId: "cdf", - devIds:devIdArr.value, - planId:planId.value + devIds:deviceIds, + planId:planId, + operateType:'0' // '0'为预检测、‘1‘为正式检测 }).then(res=>{