Merge remote-tracking branch 'origin/master'

# Conflicts:
#	frontend/src/views/home/components/table.vue

frontend/src/views/home/components/channelPairing.vue

@@ -207,10 +207,12 @@ const devIds = ref<string[]>()
 const standardDevIds = ref<string[]>()
 
 const open = async () => {
+    console.log('开始打开通道配对')
     edges.value = []
     devIds.value = prop.devIdList.map(d => d.id)
     standardDevIds.value = prop.pqStandardDevList.map(d => d.id)
     planId.value = prop.planIdKey
+
     nodes.value = createNodes(prop.devIdList, prop.pqStandardDevList, prop.deviceMonitor)
     dialogVisible.value = true
     onPaneReady()

frontend/src/views/home/components/comparePreTest.vue

@@ -482,15 +482,19 @@ watch(webMsgSend, function (newValue, oldValue) {
 watch(activeIndex, function (newValue, oldValue) {
   if(props.onlyWave === true)
   {
-    if(newValue == 2){
+    if (Number(collapseActiveName.value) < activeTotalNum.value - 2) {
-      collapseActiveName.value = '4'
+      if(newValue == 2){
-    }else{
+            collapseActiveName.value = '4'
-      collapseActiveName.value = (newValue + 1).toString()
+      }else{
+            collapseActiveName.value = (newValue + 1).toString()
+      }
     }
-    console.log("onlyWave2222",collapseActiveName.value)
   } else
   { 
-    collapseActiveName.value = (newValue + 1).toString()
+    if (Number(collapseActiveName.value) < activeTotalNum.value) {
+      collapseActiveName.value = (newValue + 1).toString()
+    }
+
   }
 })
 

frontend/src/views/home/components/deviceConnectionPopup.vue

@@ -42,6 +42,7 @@
     <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
     <CompareTestPopup
         ref="testPopup"
+        :key="compareTestKey" 
         v-if="CompareTestVisible"
         :devIdList="devIdList"
         :pqStandardDevList="pqStandardDevList"
@@ -70,7 +71,7 @@ const dialogVisible = ref(false)
 const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
 const testPopup = ref()
 const dialogTitle = ref('手动检测')
-
+const compareTestKey = ref(0)
 // 计算对话框高度
 const dialogHeight = ref(600)
 const CompareTestVisible = ref(false)
@@ -266,6 +267,7 @@ const handleNext = async () => {
 }
 
 const openTestDialog = async () => {
+    compareTestKey.value++  // 每次调用时更新key
     CompareTestVisible.value = true
     // 转换连接信息，只保留设备ID和通道号
     const connections = edges.value.reduce(