From 8e3368bd29587b5da5f3b8c87010f52426be285e Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 21 Aug 2025 09:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/home/components/compareTest.vue | 37 ++++++++++++-------
 .../home/components/compareTestPopup.vue      |  7 +---
 .../home/components/deviceConnectionPopup.vue | 28 ++++++++------
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue
index fc1940b..34821c8 100644
--- a/frontend/src/views/home/components/compareTest.vue
+++ b/frontend/src/views/home/components/compareTest.vue
@@ -11,7 +11,7 @@
                 <el-progress style="width: 82%; margin-right: 3%" :percentage="percentage" :color="customColors" />
                 <el-button style="width: 10%" type="text" :icon="InfoFilled" @click="showTestLog">检测项进度</el-button>
             </div>
-        
+
             <div class="dialog-content">
                 <el-table
                     :data="checkResultView"
@@ -270,7 +270,6 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
 })
 
 watch(testStatus, function (newValue, oldValue) {
-    console.log('🚀 ~ newValue:', newValue)
     if (newValue == 'start' || newValue == 'waiting') {
         if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest) {
             ElMessage.success('初始化开始!')
@@ -313,10 +312,8 @@ watch(
                                 scriptName: item.scriptName,
                                 devices: []
                             }
-                           let message=JSON.parse(newValue.data)
-
+                            let message = JSON.parse(newValue.data)
                             for (let i = 0; i < message?.length; i++) {
-                          
                                 temp.devices.push({
                                     deviceId: message[i].deviceId,
                                     deviceName: message[i].deviceName,
@@ -325,10 +322,25 @@ watch(
                             }
                             result.push(temp)
                         })
-                        console.log("🚀 ~ result:", result)
-
                         Object.assign(checkResult, result)
-
+                        testLogList.push({
+                            type: 'info',
+                            log: `${new Date().toLocaleString()}：` + '检测完成!'
+                        })
+                        if(testLogList[0].log === '正在检测,请稍等...'){
+                            testLogList.shift()
+                        }
+                        stopTimeCount()
+                        break
+                         case 25003:
+                       
+                        testLogList.push({
+                            type: 'error',
+                            log: `${new Date().toLocaleString()}：` + '检测失败!'
+                        })
+                           if(testLogList[0].log === '正在检测,请稍等...'){
+                            testLogList.shift()
+                        }
                         stopTimeCount()
                         break
                     default:
@@ -337,9 +349,7 @@ watch(
                                 type: newValue.code == 10200 ? 'info' : 'error',
                                 log: `${new Date().toLocaleString()}：` + newValue.data
                             })
-                            if (newValue.code == 25003) {
-                                stopTimeCount()
-                            }
+                      
                             updatePercentage()
                         }
 
@@ -485,7 +495,6 @@ const initCheckResult = () => {
 
 // 更新检测结果（详细到通道）
 const updateCheckResult = (data: CheckData.ScriptChnItem) => {
-    console.log('🚀 ~ updateCheckResult ~ data:', data)
     const { scriptType } = { ...data }
 
     checkResult.forEach(item => {
@@ -651,7 +660,7 @@ const handlePause = () => {
 }
 const initializeParameters = () => {
     percentage.value = 0
-    testLogList.splice(0, testLogList.length, { type: 'info', log: '暂无数据，等待检测开始' })
+    testLogList.splice(0, testLogList.length, { type: 'info', log: '正在检测,请稍等...' })
 }
 
 const pauseSuccessCallback = () => {
@@ -676,6 +685,8 @@ const handleResumeTest = () => {
 }
 //
 onMounted(() => {
+    console.log(123123);
+    
     initializeParameters()
 })
 
diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue
index 70eb0fa..342f1dd 100644
--- a/frontend/src/views/home/components/compareTestPopup.vue
+++ b/frontend/src/views/home/components/compareTestPopup.vue
@@ -367,13 +367,10 @@ watch(TestStatus, function (newValue, oldValue) {
 })
 
 watch(stepsActiveIndex, function (newValue, oldValue) {
-    console.log(
-        '🚀 ~ checkStore.selectTestItems.test && checkStore.selectTestItems.preTest && newValue == 2:',
-        checkStore.selectTestItems.test && checkStore.selectTestItems.preTest && newValue == 2
-    )
-
     if (checkStore.selectTestItems.test && checkStore.selectTestItems.preTest && newValue == 2) {
         setTimeout(() => {
+            console.log(1);
+            
             testRef.value.initializeParameters()
             testRef.value.showTestLog()
             testRef.value.startTimeCount()
diff --git a/frontend/src/views/home/components/deviceConnectionPopup.vue b/frontend/src/views/home/components/deviceConnectionPopup.vue
index 14d09db..919d66f 100644
--- a/frontend/src/views/home/components/deviceConnectionPopup.vue
+++ b/frontend/src/views/home/components/deviceConnectionPopup.vue
@@ -40,7 +40,7 @@
 
     <!-- 手动检测-勾选检测项弹窗 -->
     <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
-    <CompareTestPopup ref="testPopup"></CompareTestPopup>
+    <CompareTestPopup ref="testPopup" v-if="CompareTestVisible"></CompareTestPopup>
 </template>
 
 <script lang="ts" setup>
@@ -64,7 +64,7 @@ const testPopup = ref()
 const dialogTitle = ref('手动检测')
 // 计算对话框高度
 const dialogHeight = ref(600)
-
+const CompareTestVisible = ref(false)
 // 初始化 VueFlow，注册自定义连线类型
 const { edges, setViewport } = useVueFlow({
     edgeTypes: {
@@ -225,14 +225,16 @@ const handleNext = async () => {
             })
         }
     })
-    console.log('🚀 ~ handleNext ~ edges.value:', edges.value)
 
     await checkStore.setChnNum(chnNumList)
+    CompareTestVisible.value = false
     dialogVisible.value = false
+
     selectTestItemPopupRef.value?.open()
 }
 
 const openTestDialog = async () => {
+    CompareTestVisible.value = true
     // 转换连接信息，只保留设备ID和通道号
     const connections = edges.value.reduce(
         (map, edge) => {
@@ -250,15 +252,17 @@ const openTestDialog = async () => {
 
     generateChannelMapping()
 
-    testPopup.value?.open(
-        dialogTitle.value,
-        channelMapping.value,
-        planId.value,
-        jwtUtil.getLoginName(),
-        devIds.value,
-        standardDevIds.value,
-        connections
-    )
+    setTimeout(() => {
+        testPopup.value?.open(
+            dialogTitle.value,
+            channelMapping.value,
+            planId.value,
+            jwtUtil.getLoginName(),
+            devIds.value,
+            standardDevIds.value,
+            connections
+        )
+    }, 100)
 }
 
 // 转换 edges.value 为 channelMapping 格式