From 2aee4b281df8c99053d997b0fa0a879f79f9b233 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Wed, 20 Aug 2025 20:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=AD=A3=E5=BC=8F=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/check/interface/index.ts     |    1 +
 frontend/src/stores/modules/check.ts          |    5 +
 frontend/src/utils/webSocketClient.ts         |    3 +-
 .../views/home/components/comparePreTest.vue  |    1 -
 .../src/views/home/components/compareTest.vue | 1306 ++++++++---------
 .../home/components/compareTestPopup.vue      |  865 ++++++-----
 .../home/components/deviceConnectionPopup.vue |  711 ++++-----
 7 files changed, 1461 insertions(+), 1431 deletions(-)

diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts
index 1e87c74..da4309a 100644
--- a/frontend/src/api/check/interface/index.ts
+++ b/frontend/src/api/check/interface/index.ts
@@ -103,6 +103,7 @@ export namespace CheckData {
         devCurr: number; //设备电流
         factorFlag: number; //是否支持系数校准
         checkResult:number; //检测结果
+        chnNumList: object[]; //连线存储数据
     }
 
     // 用来描述检测脚本类型
diff --git a/frontend/src/stores/modules/check.ts b/frontend/src/stores/modules/check.ts
index a10c1a0..02e89ed 100644
--- a/frontend/src/stores/modules/check.ts
+++ b/frontend/src/stores/modules/check.ts
@@ -14,6 +14,7 @@ export const useCheckStore = defineStore(CHECK_STORE_KEY, {
         showDetailType: 0, // 0:数据查询 1:误差体系跟换 2：正式检测
         temperature: 0,
         humidity: 0,
+        chnNumList: [],//连线数据
     }),
     getters: {},
     actions: {
@@ -37,6 +38,7 @@ export const useCheckStore = defineStore(CHECK_STORE_KEY, {
             this.selectTestItems.test = true
         },
         setSelectTestItems(selectTestItems: CheckData.SelectTestItem) {
+            console.log("🚀 ~ setSelectTestItems ~ selectTestItems:", selectTestItems)
             this.selectTestItems = selectTestItems
         },
         setCheckType(checkType: number) {
@@ -54,6 +56,9 @@ export const useCheckStore = defineStore(CHECK_STORE_KEY, {
         setHumidity(humidity: number) {
             this.humidity = humidity
         },
+         setChnNum(chnNumList: string[]) {
+            this.chnNumList = chnNumList
+        },
 
     }
 });
\ No newline at end of file
diff --git a/frontend/src/utils/webSocketClient.ts b/frontend/src/utils/webSocketClient.ts
index 8d115e6..bf323b0 100644
--- a/frontend/src/utils/webSocketClient.ts
+++ b/frontend/src/utils/webSocketClient.ts
@@ -190,7 +190,8 @@ export default class SocketService {
      * WebSocket连接配置
      */
     private config: SocketConfig = {
-        url: 'ws://127.0.0.1:7777/hello',
+        // url: 'ws://127.0.0.1:7777/hello',
+        url: 'ws://192.168.1.124:7777/hello',
         heartbeatInterval: 9000,        // 9秒心跳间隔
         reconnectDelay: 5000,           // 5秒重连延迟
         maxReconnectAttempts: 5,        // 最多重连5次
diff --git a/frontend/src/views/home/components/comparePreTest.vue b/frontend/src/views/home/components/comparePreTest.vue
index c6ed0fd..c455c62 100644
--- a/frontend/src/views/home/components/comparePreTest.vue
+++ b/frontend/src/views/home/components/comparePreTest.vue
@@ -201,7 +201,6 @@ interface DeviceData {
 const testDataStructure = ref<Record<string, DeviceData>>({});
 
 watch(webMsgSend, function (newValue, oldValue) {
-  console.log('webMsgSend', newValue)
   if (testStatus.value !== 'waiting') {
     if(newValue.code == 25004){
       ElMessage.error('接收数据超时！')
diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue
index f5164df..9f28ab7 100644
--- a/frontend/src/views/home/components/compareTest.vue
+++ b/frontend/src/views/home/components/compareTest.vue
@@ -1,93 +1,135 @@
 <template>
-  <div>
-    <div class="dialog" v-bind="dialogBig">
-      <div class="dialog-title">
-        <div class="timeView">
-          <el-icon style="margin: 0px 5px;">
-            <Clock/>
-          </el-icon>
-          <span>检测用时：{{ timeView }}</span>
+    <div>
+        <div class="dialog" v-bind="dialogBig">
+            <div class="dialog-title">
+                <div class="timeView">
+                    <el-icon style="margin: 0px 5px">
+                        <Clock />
+                    </el-icon>
+                    <span>检测用时：{{ timeView }}</span>
+                </div>
+                <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>
+            {{ checkResultView }}
+            <div class="dialog-content">
+                <el-table
+                    :data="checkResultView"
+                    row-key="scriptType"
+                    height="450px"
+                    :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' }"
+                    style="width: 100%"
+                    border
+                >
+                    <el-table-column
+                        fixed
+                        prop="scriptName"
+                        label="检测项目"
+                        width="150px"
+                        align="center"
+                    ></el-table-column>
+
+                    <template v-if="chnSum <= MAX_CHN_SUM">
+                        <el-table-column
+                            v-for="(item, index1) in deviceList"
+                            :key="item.deviceId"
+                            :label="item.deviceName"
+                            :min-width="110"
+                            align="center"
+                        >
+                            <el-table-column
+                                v-for="(chnItem, index2) in checkStore.chnNumList"
+                                :key="`${item.deviceId}${chnItem}`"
+                                :label="'通道' + chnItem.label"
+                                align="center"
+                            >
+                                <template #default="{ row }">
+                                    <el-tooltip
+                                        :content="
+                                            row.devices[index1].chnResult[index2].icon === 'More'
+                                                ? '暂无数据'
+                                                : row.devices[index1].chnResult[index2].icon === 'CircleCheckFilled'
+                                                  ? '符合'
+                                                  : row.devices[index1].chnResult[index2].icon === 'Close'
+                                                    ? '不符合'
+                                                    : row.devices[index1].chnResult[index2].icon ===
+                                                        'WarnTriangleFilled'
+                                                      ? '数据异常'
+                                                      : row.devices[index1].chnResult[index2].icon === 'Loading'
+                                                        ? '检测中'
+                                                        : '连接中断'
+                                        "
+                                        placement="right"
+                                    >
+                                        <el-button
+                                            :disabled="
+                                                row.devices[index1].chnResult[index2].color ===
+                                                    CheckData.ButtonColorEnum.INFO ||
+                                                row.devices[index1].chnResult[index2].color ===
+                                                    CheckData.ButtonColorEnum.LOADING
+                                            "
+                                            :color="row.devices[index1].chnResult[index2].color"
+                                            size="small"
+                                            @click="handleClick(item, chnItem, row.scriptType)"
+                                            style="align-self: center"
+                                        >
+                                            <el-icon
+                                                v-if="row.devices[index1].chnResult[index2].icon === 'Loading'"
+                                                class="loading-box"
+                                                style="color: #fff"
+                                            >
+                                                <component :is="Loading" />
+                                            </el-icon>
+                                            <el-icon v-else style="color: #fff">
+                                                <component :is="row.devices[index1].chnResult[index2].icon" />
+                                            </el-icon>
+                                        </el-button>
+                                    </el-tooltip>
+                                </template>
+                            </el-table-column>
+                        </el-table-column>
+                    </template>
+                </el-table>
+            </div>
         </div>
-        <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" row-key="scriptType" height="450px"
-                  :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' } " style="width: 100%"
-                  border>
-          <el-table-column fixed prop="scriptName" label="检测项目" width="150px" align="center">
-          </el-table-column>
-
-          <template v-if="chnSum<=MAX_CHN_SUM">
-            <el-table-column v-for="(item,index1) in deviceList" :key="item.deviceId" :label="item.deviceName"
-                             :min-width="110" align="center">
-              <el-table-column v-for="(chnItem,index2) in item.chnNum" :key="`${item.deviceId}${chnItem}`"
-                               :label="'通道'+chnItem" align="center">
-                <template #default="{row}">
-                  <el-tooltip
-                      :content="row.devices[index1].chnResult[index2].icon==='More' ? '暂无数据'
-                      : row.devices[index1].chnResult[index2].icon==='CircleCheckFilled' ? '符合'
-                      : row.devices[index1].chnResult[index2].icon==='Close' ? '不符合'
-                      : row.devices[index1].chnResult[index2].icon==='WarnTriangleFilled' ? '数据异常'
-                      : row.devices[index1].chnResult[index2].icon==='Loading'? '检测中':'连接中断'"
-                      placement="right">
-                        
-                    <el-button
-                        :disabled="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO || row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.LOADING"
-                        :color="row.devices[index1].chnResult[index2].color"
-                        size="small"
-                        @click="handleClick(item,chnItem,row.scriptType)"
-                        style="align-self: center;"
+        <div class="drawer-container">
+            <el-drawer v-model="drawer" title="检测项进度" direction="btt" :size="'38%'">
+                <div ref="scrollContainerRef" style="height: 100%; overflow-y: auto">
+                    <p
+                        v-for="(item, index) in testLogList"
+                        :key="index"
+                        :style="{
+                            color:
+                                item.type === 'error'
+                                    ? '#F56C6C'
+                                    : item.type === 'warning'
+                                      ? '#e6a23c'
+                                      : 'var(--el-text-color-regular)'
+                        }"
                     >
-                      <el-icon v-if="row.devices[index1].chnResult[index2].icon==='Loading'" class="loading-box"
-                               style="color: #fff">
-                        <component :is="Loading"/>
-                      </el-icon>
-                      <el-icon v-else style="color: #fff">
-                        <component :is="row.devices[index1].chnResult[index2].icon"/>
-                      </el-icon>
-                    </el-button>
-
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </template>
-        </el-table>
-      </div>
- 
-    </div>
-    <div class="drawer-container">
-      <el-drawer v-model="drawer" title="检测项进度" direction="btt" :size="'38%'">
-        <div ref="scrollContainerRef" style="height: 100%; overflow-y: auto;">
-          <p v-for="(item, index) in testLogList"
-             :key="index"
-             :style="{color:item.type==='error'?'#F56C6C': item.type==='warning'?'#e6a23c':'var(--el-text-color-regular)'}">
-            {{ item.log }}<br/>
-          </p>
+                        {{ item.log }}
+                        <br />
+                    </p>
+                </div>
+            </el-drawer>
         </div>
-      </el-drawer>
-    </div>
 
-    <CompareDataCheckSingleChannelSingleTestPopup ref="dataCheckSingleChannelSingleTestPopupRef"/>
-  </div>
+        <CompareDataCheckSingleChannelSingleTestPopup ref="dataCheckSingleChannelSingleTestPopupRef" />
+    </div>
 </template>
 <script lang="tsx" setup name="test">
-import {InfoFilled, Loading} from '@element-plus/icons-vue'
+import { InfoFilled, Loading } from '@element-plus/icons-vue'
 import CompareDataCheckSingleChannelSingleTestPopup from './compareDataCheckSingleChannelSingleTestPopup.vue'
-import {computed, ComputedRef, onBeforeMount, reactive, ref, toRef, watch} from "vue";
-import {dialogBig} from "@/utils/elementBind";
-import {CheckData} from "@/api/check/interface"
-import {useCheckStore} from "@/stores/modules/check";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {getBigTestItem} from "@/api/check/test";
-import {getAutoGenerate} from "@/api/user/login";
-import {generateDevReport} from "@/api/plan/plan";
+import { computed, ComputedRef, onBeforeMount, reactive, ref, toRef, watch, onMounted } from 'vue'
+import { dialogBig } from '@/utils/elementBind'
+import { CheckData } from '@/api/check/interface'
+import { useCheckStore } from '@/stores/modules/check'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getBigTestItem } from '@/api/check/test'
+import { getAutoGenerate } from '@/api/user/login'
+import { generateDevReport } from '@/api/plan/plan'
 import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
+
 import { useDictStore } from '@/stores/modules/dict'
 
 const checkStore = useCheckStore()
@@ -100,25 +142,32 @@ const MAX_CHN_SUM = 12
 let checkTotal = 0
 
 const props = defineProps({
-  testStatus: {
-    type: String,
-    default: 'waiting'
-  },
-  stepsActive: {
-    type: Number,
-  },
-  webMsgSend: {
-    type: Object,
-    default: () => ({})
-  }
+    testStatus: {
+        type: String,
+        default: 'waiting'
+    },
+    stepsActive: {
+        type: Number
+    },
+    webMsgSend: {
+        type: Object,
+        default: () => ({})
+    }
 })
 
-const emit = defineEmits(['update:testStatus', 'update:webMsgSend', 'sendPause', 'sendResume', 'sendReCheck', 'closeWebSocket']);
+const emit = defineEmits([
+    'update:testStatus',
+    'update:webMsgSend',
+    'sendPause',
+    'sendResume',
+    'sendReCheck',
+    'closeWebSocket'
+])
 
 // 用来保存测试项进度抽屉是否打开
 const drawer = ref(false)
 // 进度条颜色
-const customColors = [{color: "#91cc75", percentage: 100}]
+const customColors = [{ color: '#91cc75', percentage: 100 }]
 // 检测脚本数据
 let scriptData: CheckData.ScriptItem[] = []
 // 用来保存被检设备
@@ -126,7 +175,7 @@ const deviceList = reactive<CheckData.Device[]>([])
 // 当前进行的测试项索引
 let activeIndex = 0
 // 百分比
-const percentage = ref(0);
+const percentage = ref(0)
 // 时间计数器
 let timer: any = null
 const timeCount = ref(0)
@@ -139,768 +188,599 @@ const timeDifference = ref(0)
 // 真正的检测结果（详细到通道）
 const checkResult = reactive<CheckData.ScriptChnItem[]>([])
 // 用来存放检测出现失败的测试项id。只要有一个通道检测不合格，则该检测项的id会被加入该数组。
-let errorCheckItem: Array<{ scriptType: string, type: CheckData.ChnCheckResultEnum }> = []
+let errorCheckItem: Array<{ scriptType: string; type: CheckData.ChnCheckResultEnum }> = []
 // 用来存放检测日志
-const testLogList = reactive<CheckData.LogItem[]>([{type: 'info', log: '暂无数据，等待检测开始'}])
+const testLogList = reactive<CheckData.LogItem[]>([{ type: 'info', log: '暂无数据，等待检测开始' }])
 
 const testStatus = toRef(props, 'testStatus')
 const webMsgSend = toRef(props, 'webMsgSend')
 
-const scrollContainerRef = ref();
-const dataCheckSingleChannelSingleTestPopupRef = ref<InstanceType<typeof CompareDataCheckSingleChannelSingleTestPopup>>()
+const scrollContainerRef = ref()
+const dataCheckSingleChannelSingleTestPopupRef =
+    ref<InstanceType<typeof CompareDataCheckSingleChannelSingleTestPopup>>()
 
 // 总通道数
 const chnSum = computed(() => {
-  let sum = 0
-  deviceList.forEach((item) => {
-    sum += item.chnNum
-  })
-  return sum
+    let sum = 0
+    deviceList.forEach(item => {
+        sum += item.chnNum
+    })
+    return sum
 })
 
 // 用来展示的检测结果
 const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(() => {
-  let result: CheckData.ScriptChnViewItem[] = checkResult.map(item => {
-    let temp: CheckData.ScriptChnViewItem = {
-      scriptType: item.scriptType,
-      scriptName: item.scriptName,
-      devices: []
-    }
+    console.log('🚀 ~ tem.devices:', checkResult)
 
-    item.devices.forEach(device => {
-      let tempChnBtnResult: CheckData.ButtonResult[] = []
-
-      if (chnSum.value <= MAX_CHN_SUM) {
-        for (let j = 0; j < device.chnResult.length; j++) {
-          switch (device.chnResult[j]) {
-            case CheckData.ChnCheckResultEnum.UNKNOWN:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'More'})
-              break;
-            case CheckData.ChnCheckResultEnum.LOADING:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.LOADING, icon: 'Loading'})
-              break;
-            case CheckData.ChnCheckResultEnum.SUCCESS:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.SUCCESS, icon: 'CircleCheckFilled'})
-              break;
-            case CheckData.ChnCheckResultEnum.FAIL:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.DANGER, icon: 'Close'})
-              break;
-            case CheckData.ChnCheckResultEnum.TIMEOUT:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.WARNING, icon: 'Link'})
-              break;
-            case CheckData.ChnCheckResultEnum.ERRORDATA:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.WARNING, icon: 'WarnTriangleFilled'})
-              break;
-            case CheckData.ChnCheckResultEnum.NOT_PART_IN_ERROR:
-              tempChnBtnResult.push({color: CheckData.ButtonColorEnum.INFO, icon: 'Minus'})
-              break;
-            default:
-              break;
-          }
+    let result: CheckData.ScriptChnViewItem[] = checkResult.map(item => {
+        let temp: CheckData.ScriptChnViewItem = {
+            scriptType: item.scriptType,
+            scriptName: item.scriptName,
+            devices: []
         }
-      }
-      temp.devices.push({
-        deviceId: device.deviceId,
-        deviceName: device.deviceName,
-        chnResult: tempChnBtnResult
-      })
-    })
-    return temp
-  })
 
-  return result
+        item.devices.forEach(device => {
+            let tempChnBtnResult: CheckData.ButtonResult[] = []
+
+            if (chnSum.value <= MAX_CHN_SUM) {
+                for (let j = 0; j < device.chnResult.length; j++) {
+                    switch (device.chnResult[j]) {
+                        case CheckData.ChnCheckResultEnum.UNKNOWN:
+                            tempChnBtnResult.push({ color: CheckData.ButtonColorEnum.INFO, icon: 'More' })
+                            break
+                        case CheckData.ChnCheckResultEnum.LOADING:
+                            tempChnBtnResult.push({ color: CheckData.ButtonColorEnum.LOADING, icon: 'Loading' })
+                            break
+                        case CheckData.ChnCheckResultEnum.SUCCESS:
+                            tempChnBtnResult.push({
+                                color: CheckData.ButtonColorEnum.SUCCESS,
+                                icon: 'CircleCheckFilled'
+                            })
+                            break
+                        case CheckData.ChnCheckResultEnum.FAIL:
+                            tempChnBtnResult.push({ color: CheckData.ButtonColorEnum.DANGER, icon: 'Close' })
+                            break
+                        case CheckData.ChnCheckResultEnum.TIMEOUT:
+                            tempChnBtnResult.push({ color: CheckData.ButtonColorEnum.WARNING, icon: 'Link' })
+                            break
+                        case CheckData.ChnCheckResultEnum.ERRORDATA:
+                            tempChnBtnResult.push({
+                                color: CheckData.ButtonColorEnum.WARNING,
+                                icon: 'WarnTriangleFilled'
+                            })
+                            break
+                        case CheckData.ChnCheckResultEnum.NOT_PART_IN_ERROR:
+                            tempChnBtnResult.push({ color: CheckData.ButtonColorEnum.INFO, icon: 'Minus' })
+                            break
+                        default:
+                            break
+                    }
+                }
+            }
+            temp.devices.push({
+                deviceId: device.deviceId,
+                deviceName: device.deviceName,
+                chnResult: tempChnBtnResult
+            })
+        })
+        return temp
+    })
+
+    return result
 })
 
 watch(testStatus, function (newValue, oldValue) {
-  if (newValue == 'start') {
-    if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest) {
-      ElMessage.success('初始化开始!')
-      emit('update:testStatus', 'test_init')
-      testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
-    } else {
-      emit('update:testStatus', 'process')
+    console.log('🚀 ~ newValue:', newValue)
+    if (newValue == 'start' || newValue == 'waiting') {
+        if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest) {
+            ElMessage.success('初始化开始!')
+            emit('update:testStatus', 'test_init')
+            if (checkStore.selectTestItems.test && checkStore.selectTestItems.preTest) {
+                testLogList.push({ type: 'info', log: `${new Date().toLocaleString()}：初始化开始！` })
+            }
+        } else {
+            emit('update:testStatus', 'process')
+        }
+        // 开始计时
+        startTimeCount()
+        showTestLog()
+        //startTimer() // todo 可移除
+        startData.value = new Date()
+        timeDifference.value = 0
+    } else if (newValue == 'error') {
+        stopTimeCount()
     }
-    startTimeCount()
-
-    showTestLog()
-    //startTimer() // todo 可移除
-    startData.value = new Date();
-    timeDifference.value = 0;
-  }
-
-  if (newValue == 'recheck' || newValue == 'error' || newValue == 'test_init_fail' || newValue == 'connect_timeout' || newValue == 'pause_timeout' || oldValue == 'error_flow_end') {
-    stopTimeCount()
-  }
 })
 
 // 次数
 let count = 0
 
-watch(webMsgSend, function (newValue, oldValue) {
-  console.log('webMsgSend', newValue)
-  if (testStatus.value !== 'waiting') {
-     handleStartItem('V', 'newValue.desc')
-    if (props.stepsActive === 4) {
-        switch (newValue.requestId) {
-          case 'server_error':
-            if (newValue.operateCode === 'server_error' && count === 0) {
-              ElMessageBox.alert('服务端主动关闭连接!', '初始化失败', {
-                confirmButtonText: '确定',
-                type: 'error',
-              })
-              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：服务端主动关闭连接！`})
-              emit('update:testStatus', 'test_init_fail')
-              count++
-            }
-            break;
-          case 'device_error':
-            if (newValue.operateCode === 'device_error' && count === 0) {
-              ElMessageBox.alert('设备端主动关闭连接!', '初始化失败', {
-                confirmButtonText: '确定',
-                type: 'error',
-              })
-              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备端主动关闭连接！`})
-              emit('update:testStatus', 'test_init_fail')
-              count++
-            }
-            break;
-          case 'formal_real': // 正式测试
-            switch (newValue.operateCode) {
-              case "stop_timeout":
-                ElMessageBox.alert(`暂停时间已过10分钟，本次检测已失效，请重新发起检测！`, '暂停时间过长', {
-                  confirmButtonText: '确定',
-                  type: 'error',
-                })
-                emit('update:testStatus', 'pause_timeout')
-                break;
-            }
-            break;
-          case 'error_flow_end':
-            ElMessageBox.alert(`当前流程存在异常结束！`, '初始化失败', {
-              confirmButtonText: '确定',
-              type: 'error',
-            })
-            emit('update:testStatus', 'test_init_fail')
-            break
-          case 'socket_timeout':
-            switch (newValue.operateCode) {
-              case "VOLTAGE":
-                // todo 超时处理 页面按钮更新
-                ElMessageBox.alert('连接超时！', '连接超时', {
-                  confirmButtonText: '确定',
-                  type: 'error',
-                })
-                emit('update:testStatus', 'connect_timeout')
-                break;
-            }
-            break;
-          case 'connect':
-            switch (newValue.operateCode) {
-              case "Source":
-                ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
-                  confirmButtonText: '确定',
-                  type: 'error',
-                })
-                testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
-                break;
-              case "Dev":
-                ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
-                  confirmButtonText: '确定',
-                  type: 'error',
-                })
-                testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
-                break;
-            }
-            emit('update:testStatus', 'test_init_fail')
-            break;
-          case 'yjc_ytxjy':
-            switch (newValue.operateCode) {
-              case 'INIT_GATHER':
-                if (newValue.code == 10200) {
-                  testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：源初始化成功！`})
-                  percentage.value = 1
-                }
-                if (newValue.code == -1) {
-                  ElMessageBox.alert('源未知异常！', '初始化失败', {
-                    confirmButtonText: '确定',
-                    type: 'error',
-                  })
-                  testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`})
-                  emit('update:testStatus', 'test_init_fail')
-                }
-                break;
-            }
-            break;
-          case 'yjc_sbtxjy':
-            switch (newValue.operateCode) {
-              case 'INIT_GATHER$01':
-                if (newValue.code == 25001) {
-                  testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：设备通讯校验成功！`})
-                  percentage.value = 2
-                }
-                break
-            }
-            break;
-          case 'yjc_xyjy':
-            switch (newValue.operateCode) {
-              case 'VERIFY_MAPPING$01':
-                if (newValue.code == 25001) {
-                  ElMessage.success('初始化成功!')
-                  testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：协议校验成功！`})
-                  timeDifference.value = +new Date().getTime() - startData.value.getTime();
-                  testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化成功！`})
-                  percentage.value = 3
+watch(
+    webMsgSend,
+    function (newValue, oldValue) {
+        if (testStatus.value == 'test_init') {
+            // 正式检测
+        } else {
+            // 预监测 正式检测
+            if (newValue.requestId == 'formal_real') {
+                switch (newValue.code) {
+                    case 25001:
+                        let result: CheckData.ScriptChnItem[] = []
+                        scriptData.forEach(item => {
+                            // 处理当前节点的数据
+                            let temp: CheckData.ScriptChnItem = {
+                                scriptType: item.id,
+                                scriptName: item.scriptName,
+                                devices: []
+                            }
+                           let message=JSON.parse(newValue.data)
 
-                  activeIndex = getNextActiveIndex() + 2
-                  //startTimer()
+                            for (let i = 0; i < message?.length; i++) {
+                          
+                                temp.devices.push({
+                                    deviceId: message[i].deviceId,
+                                    deviceName: message[i].deviceName,
+                                    chnResult: message[i].chnResult
+                                })
+                            }
+                            result.push(temp)
+                        })
+                        console.log("🚀 ~ result:", result)
 
-                  emit('update:testStatus', 'process')
-                } else if (newValue.code == 10200) {
-                  let data = JSON.parse(newValue.data)
-                  ElMessageBox.alert(`脚本与icd校验失败！icd名称：${data['icdType']} -> 校验项：${data['dataType']}`, '初始化失败', {
-                    confirmButtonText: '确定',
-                    type: 'error',
-                  })
-                  testLogList.push({
-                    type: 'error',
-                    log: `${new Date().toLocaleString()}：脚本与icd校验失败！icd名称：${data['icdType']} -> 校验项：${data['dataType']}`
-                  })
-                  emit('update:testStatus', 'test_init_fail')
-                } else if (newValue.code == 10500) {
-                  ElMessageBox.alert(`装置中未找到该icd！`, '初始化失败', {
-                    confirmButtonText: '确定',
-                    type: 'error',
-                  })
-                  testLogList.push({
-                    type: 'error',
-                    log: `${new Date().toLocaleString()}：装置中未找到该icd！`
-                  })
-                  emit('update:testStatus', 'test_init_fail')
+                        Object.assign(checkResult, result)
+
+                        stopTimeCount()
+                        break
+                    default:
+                        if (newValue.code != 10201) {
+                            testLogList.push({
+                                type: newValue.code == 10200 ? 'info' : 'error',
+                                log: `${new Date().toLocaleString()}：` + newValue.data
+                            })
+                            if (newValue.code == 25003) {
+                                stopTimeCount()
+                            }
+                            updatePercentage()
+                        }
+
+                        break
                 }
-                break;
             }
-            break;
-          case 'preStopTest':
-            if (newValue.operateCode == 'stop') {
-              ElMessage.success('暂停成功')
-              emit('update:testStatus', 'paused')
-              pauseSuccessCallback()
-            }
-            break;
-          case 'Resume_Success':
-            ElMessage.success('开始继续检测')
-            emit('update:testStatus', 'process')
-            handleResumeTest()
-            break;
-          case 'FREQ_Start':
-            handleStartItem('FREQ', newValue.desc)
-            break;
-          case 'FREQ_End':
-            handleEndItem('FREQ', newValue.desc, newValue.data)
-            break;
-          case 'V_Start':
-            handleStartItem('V', newValue.desc)
-            break;
-          case 'V_End':
-            handleEndItem('V', newValue.desc, newValue.data)
-            break;
-          case 'HV_Start':
-            handleStartItem('HV', newValue.desc)
-            break;
-          case 'HV_End':
-            handleEndItem('HV', newValue.desc, newValue.data)
-            break;
-          case 'HI_Start':
-            handleStartItem('HI', newValue.desc)
-            break;
-          case 'HI_End':
-            handleEndItem('HI', newValue.desc, newValue.data)
-            break;
-          case 'HP_Start':
-            handleStartItem('HP', newValue.desc)
-            break;
-          case 'HP_End':
-            handleEndItem('HP', newValue.desc, newValue.data)
-            break;
-          case 'HSV_Start':
-            handleStartItem('HSV', newValue.desc)
-            break;
-          case 'HSV_End':
-            handleEndItem('HSV', newValue.desc, newValue.data)
-            break;
-          case 'HSI_Start':
-            handleStartItem('HSI', newValue.desc)
-            break;
-          case 'HSI_End':
-            handleEndItem('HSI', newValue.desc, newValue.data)
-            break;
-          case 'VOLTAGE_Start':
-            handleStartItem('VOLTAGE', newValue.desc)
-            break;
-          case 'VOLTAGE_End':
-            handleEndItem('VOLTAGE', newValue.desc, newValue.data)
-            break;
-          case 'I_Start':
-            handleStartItem('I', newValue.desc)
-            break;
-          case 'I_End':
-            handleEndItem('I', newValue.desc, newValue.data)
-            break;
-          case 'IMBV_Start':
-            handleStartItem('IMBV', newValue.desc)
-            break;
-          case 'IMBV_End':
-            handleEndItem('IMBV', newValue.desc, newValue.data)
-            break;
-          case 'IMBA_Start':
-            handleStartItem('IMBA', newValue.desc)
-            break;
-          case 'IMBA_End':
-            handleEndItem('IMBA', newValue.desc, newValue.data)
-            break;
-          case 'F_Start':
-            handleStartItem('F', newValue.desc)
-            break;
-          case 'F_End':
-            handleEndItem('F', newValue.desc, newValue.data)
-            break;
-          case 'Quit':
-            console.log('检测结束')
-            break;
         }
-      }
-  }
-}, {deep: true})
-
-const handleStartItem = (code: string, desc: string | undefined) => {
-if (desc === undefined) {
-    console.log('开始检测项：', code)
-    updateCheckResultView(code, true)  // 更新界面为加载状态
-  } else {
-    // 子测试项开始
-    testLogList.push({ type: 'info', log: `${new Date().toLocaleString()}：${desc}准确度检测：开始` })
-  }
-}
-
-const handleEndItem = (code: string, desc: string | undefined, devices: CheckData.DeviceCheckResult[] = []) => {
-  if (desc === undefined) {
-    updatePercentage()
-    updateCheckResultView(code, false, devices)
-    updateLog(false)
-    if (testStatus.value != 'paused') {
-      activeIndex = getNextActiveIndex(code)
-      //startTimer()
-    }
-  } else {
-    let result = getResult(devices)
-    // if (desc.length > 150) {
-    //   desc = desc.substring(0, 150) + '...'
-    // }
-    if (result === 1) {
-      testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`})
-    }
-    if (result === 2) {
-      testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：${desc}检测结束：不符合`})
-    }
-    if (result === 4) {
-      testLogList.push({type: 'warning', log: `${new Date().toLocaleString()}：${desc}检测结束：数据异常`})
-    }
-  }
-}
+    },
+    { deep: true }
+)
 
 // 更新进度条
 const updatePercentage = async () => {
-  if (activeIndex < checkTotal) {
-    percentage.value = Math.trunc(activeIndex / checkTotal * 100);
-  } else {
-    percentage.value = 100;
-    emit('update:testStatus', 'success')
+    if (testLogList.length - 1 < checkStore.chnNumList.length) {
+        percentage.value = Math.trunc(((testLogList.length - 1) / checkStore.chnNumList.length) * 100)
+    } else {
+        percentage.value = 100
+        emit('update:testStatus', 'success')
 
-    let {data: autoGenerate} = await getAutoGenerate()
-    if (autoGenerate == 1) {
-      //调用自动生成报告接口
-      let devIdList = checkStore.devices.map(item => {
-        return item.deviceId
-      })
+        let { data: autoGenerate } = await getAutoGenerate()
+        if (autoGenerate == 1) {
+            //调用自动生成报告接口
+            let devIdList = checkStore.devices.map(item => {
+                return item.deviceId
+            })
 
-      await generateDevReport({
-        'planId': checkStore.plan.id,
-        'devIdList': devIdList,
-        'scriptId': checkStore.plan.scriptId,
-        'planCode': checkStore.plan.code + ''
-      })
+            // await generateDevReport({
+            //     planId: checkStore.plan.id,
+            //     devIdList: devIdList,
+            //     scriptId: checkStore.plan.scriptId,
+            //     planCode: checkStore.plan.code + ''
+            // })
+        }
+        stopTimeCount()
+        ElMessageBox.alert(
+            '检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作',
+            '检测完成',
+            {
+                confirmButtonText: '确定'
+            }
+        )
+        // 关闭WebSocket连接
+        emit('closeWebSocket')
+        //clear();
     }
-    ElMessageBox.alert('检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作', '检测完成', {
-      confirmButtonText: '确定',
-    })
-    // 关闭WebSocket连接
-    emit('closeWebSocket')
-    //clear();
-  }
+}
+// ========== 时间计数器管理函数 ==========
+// 开始计时
+const startTimeCount = () => {
+    if (!timer) {
+        timer = setInterval(() => {
+            timeCount.value = timeCount.value + 1
+            timeView.value = secondToTime(timeCount.value)
+        }, 1000)
+    }
+}
+
+// 停止计时
+const stopTimeCount = () => {
+    if (timer) {
+        clearInterval(timer)
+        timer = null
+    }
+}
+
+// 将秒数转换为 HH:MM:SS 格式
+const secondToTime = (second: number) => {
+    let h: string | number = Math.floor(second / 3600) // 小时
+    let m: string | number = Math.floor((second - h * 3600) / 60) // 分钟
+    let s: string | number = Math.floor(second % 60) // 秒
+
+    // 补齐前导零
+    h = h < 10 ? '0' + h : h
+    m = m < 10 ? '0' + m : m
+    s = s < 10 ? '0' + s : s
+    return h + ':' + m + ':' + s
 }
 
 onBeforeMount(async () => {
-  await initScriptData()
-  initDeviceList()
-  initCheckResult()
-
+    await initScriptData()
+    initDeviceList()
+    initCheckResult()
 })
 
 const showTestLog = () => {
-  drawer.value = true
+    drawer.value = true
 }
 
 // 初始化检测脚本数据
 const initScriptData = async () => {
-  const pattern = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '';
-   let response: any = await getBigTestItem({
-    reCheckType: checkStore.reCheckType,
-    planId: checkStore.plan.id,
-    devIds: checkStore.devices.map(item => item.deviceId),
-    patternId: pattern
-  })
+    const pattern = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
+    let response: any = await getBigTestItem({
+        reCheckType: checkStore.reCheckType,
+        planId: checkStore.plan.id,
+        devIds: checkStore.devices.map(item => item.deviceId),
+        patternId: pattern
+    })
 
-  // 格式化脚本数据
-  let temp = response.data.map((item: any) => {
-    return {
-      ...item,
-      scriptName: item.scriptName,
-    }
-  })
-
-  // 保存脚本数据并设置总数
-  scriptData.push(...temp)
-  checkTotal = scriptData.length
+    // 格式化脚本数据
+    let temp = response.data.map((item: any) => {
+        return {
+            ...item,
+            scriptName: item.scriptName
+        }
+    })
 
+    // 保存脚本数据并设置总数
+    scriptData.push(...temp)
+    checkTotal = scriptData.length
 }
 // 初始化设备列表
 const initDeviceList = () => {
-  Object.assign(deviceList, checkStore.devices)
+    Object.assign(deviceList, checkStore.devices)
 }
 
 // 初始化检测结果 （详细到通道）
 const initCheckResult = () => {
-  let result: CheckData.ScriptChnItem[] = []
-  scriptData.forEach(item => {
-    // 处理当前节点的数据
-    let temp: CheckData.ScriptChnItem = {
-      scriptType: item.id,
-      scriptName: item.scriptName,
-      devices: []
-    }
-    for (let i = 0; i < deviceList?.length; i++) {
-      let tempChnResult: CheckData.ChnCheckResultEnum[] = []
-      for (let j = 0; j < deviceList[i].chnNum; j++) {
-        tempChnResult.push(CheckData.ChnCheckResultEnum.UNKNOWN)
-      }
-      temp.devices.push({
-        deviceId: deviceList[i].deviceId,
-        deviceName: deviceList[i].deviceName,
-        chnResult: tempChnResult
-      })
-    }
-    result.push(temp)
-  })
-  Object.assign(checkResult, result)
+    let result: CheckData.ScriptChnItem[] = []
+    scriptData.forEach(item => {
+        // 处理当前节点的数据
+        let temp: CheckData.ScriptChnItem = {
+            scriptType: item.id,
+            scriptName: item.scriptName,
+            devices: []
+        }
+
+        for (let i = 0; i < deviceList?.length; i++) {
+            let tempChnResult: CheckData.ChnCheckResultEnum[] = []
+            for (let j = 0; j < checkStore.chnNumList.length; j++) {
+                tempChnResult.push(CheckData.ChnCheckResultEnum.UNKNOWN)
+            }
+            temp.devices.push({
+                deviceId: deviceList[i].deviceId,
+                deviceName: deviceList[i].deviceName,
+                chnResult: tempChnResult
+            })
+        }
+        result.push(temp)
+    })
+
+    Object.assign(checkResult, result)
 }
 
 // 更新检测结果（详细到通道）
 const updateCheckResult = (data: CheckData.ScriptChnItem) => {
-  const {scriptType} = {...data}
+    console.log('🚀 ~ updateCheckResult ~ data:', data)
+    const { scriptType } = { ...data }
 
-  checkResult.forEach(item => {
-    if (item.scriptType == scriptType) {
-      for (let i = 0; i < item.devices.length; i++) {
-        let targetDevice = data.devices.find(dev => dev.deviceId === item.devices[i].deviceId)
-        if (targetDevice !== undefined) {
-          item.devices[i].chnResult = [...targetDevice.chnResult]
+    checkResult.forEach(item => {
+        if (item.scriptType == scriptType) {
+            for (let i = 0; i < item.devices.length; i++) {
+                let targetDevice = data.devices.find(dev => dev.deviceId === item.devices[i].deviceId)
+                if (targetDevice !== undefined) {
+                    item.devices[i].chnResult = [...targetDevice.chnResult]
+                }
+            }
         }
-      }
-    }
-  })
+    })
 }
 
 const scrollToBottom = () => {
-  if (scrollContainerRef.value) {
-    scrollContainerRef.value.scrollTop = scrollContainerRef.value.scrollHeight + 70;
-  }
-};
-
-
-
-watch(testLogList, () => {
-  scrollToBottom();
-}, {deep: true})
-
-
-const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckResult[]) => {
-  let type = 1
-  let tempChnResult: CheckData.ChnCheckResultEnum[] = []
-  for (let i = 0; i < devices.length; i++) {
-    tempChnResult.push(...devices[i].chnResult)
-  }
-
-  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
-    type = CheckData.ChnCheckResultEnum.ERRORDATA
-  }
-  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
-    type = CheckData.ChnCheckResultEnum.FAIL
-  }
-  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
-    type = CheckData.ChnCheckResultEnum.TIMEOUT
-    for (let i = 0; i < devices.length; i++) {
-      if (devices[i].chnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
-        testLogList.push({
-          type: 'warning',
-          log: `${new Date().toLocaleString()} ：${devices[i].deviceName}连接超时`,
-        })
-        ElMessageBox.alert('连接超时！', '连接超时', {
-          confirmButtonText: '确定',
-          type: 'error',
-        })
-        emit('update:testStatus', 'connect_timeout')
-      }
+    if (scrollContainerRef.value) {
+        scrollContainerRef.value.scrollTop = scrollContainerRef.value.scrollHeight + 70
     }
-  }
-
-  errorCheckItem.push({scriptType, type: type})
 }
 
+watch(
+    testLogList,
+    () => {
+        scrollToBottom()
+    },
+    { deep: true }
+)
 
+const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckResult[]) => {
+    let type = 1
+    let tempChnResult: CheckData.ChnCheckResultEnum[] = []
+    for (let i = 0; i < devices.length; i++) {
+        tempChnResult.push(...devices[i].chnResult)
+    }
+
+    if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
+        type = CheckData.ChnCheckResultEnum.ERRORDATA
+    }
+    if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
+        type = CheckData.ChnCheckResultEnum.FAIL
+    }
+    if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
+        type = CheckData.ChnCheckResultEnum.TIMEOUT
+        for (let i = 0; i < devices.length; i++) {
+            if (devices[i].chnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
+                testLogList.push({
+                    type: 'warning',
+                    log: `${new Date().toLocaleString()} ：${devices[i].deviceName}连接超时`
+                })
+                ElMessageBox.alert('连接超时！', '连接超时', {
+                    confirmButtonText: '确定',
+                    type: 'error'
+                })
+                emit('update:testStatus', 'connect_timeout')
+            }
+        }
+    }
+
+    errorCheckItem.push({ scriptType, type: type })
+}
 
 const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: CheckData.DeviceCheckResult[] = []) => {
-  let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
-  let temp = null
-  if (isStart) {
-    temp = getLoadingResult(scriptType)
-  } else {
-    setErrorCheckItem(scriptType, devices)
-    temp = {
-      scriptType,
-      devices
+    let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
+    let temp = null
+    if (isStart) {
+        temp = getLoadingResult(scriptType)
+    } else {
+        setErrorCheckItem(scriptType, devices)
+        temp = {
+            scriptType,
+            devices
+        }
     }
-  }
-  updateCheckResult(temp)
-};
+    updateCheckResult(temp)
+}
 
 // 获取loading状态的结果
 const getLoadingResult = (scriptType: string) => {
-  let devices = []
+    let devices = []
 
-  devices = deviceList.map(item => {
+    devices = deviceList.map(item => {
+        let tempChnResult: CheckData.ChnCheckResultEnum[] = []
+        for (let i = 0; i < item.chnNum; i++) {
+            tempChnResult.push(CheckData.ChnCheckResultEnum.LOADING)
+        }
 
-    let tempChnResult: CheckData.ChnCheckResultEnum[] = []
-    for (let i = 0; i < item.chnNum; i++) {
-      tempChnResult.push(CheckData.ChnCheckResultEnum.LOADING)
+        return {
+            deviceId: item.deviceId,
+            deviceName: item.deviceName,
+            chnResult: tempChnResult
+        }
+    })
+
+    let tempScriptChnItem: CheckData.ScriptChnItem = {
+        scriptType,
+        devices
     }
 
-    return {
-      deviceId: item.deviceId,
-      deviceName: item.deviceName,
-      chnResult: tempChnResult,
-    }
-  })
-
-  let tempScriptChnItem: CheckData.ScriptChnItem = {
-    scriptType,
-    devices,
-  }
-
-  return tempScriptChnItem
+    return tempScriptChnItem
 }
 
-
 const getResult = (devices: CheckData.DeviceCheckResult[] = []) => {
-  let type = 1
-  let tempChnResult: CheckData.ChnCheckResultEnum[] = []
-  for (let i = 0; i < devices.length; i++) {
-    tempChnResult.push(...devices[i].chnResult)
-  }
+    let type = 1
+    let tempChnResult: CheckData.ChnCheckResultEnum[] = []
+    for (let i = 0; i < devices.length; i++) {
+        tempChnResult.push(...devices[i].chnResult)
+    }
 
-  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
-    type = CheckData.ChnCheckResultEnum.ERRORDATA
-  }
-  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
-    type = CheckData.ChnCheckResultEnum.FAIL
-  }
-  return type
+    if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
+        type = CheckData.ChnCheckResultEnum.ERRORDATA
+    }
+    if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
+        type = CheckData.ChnCheckResultEnum.FAIL
+    }
+    return type
 }
 
-
 // 点击查看（设备）通道检测详情。参数1：设备信息，参数2：通道号，-1：代表查看全部通道
 const handleClick = (item: any, chnNum: number, scriptType: string) => {
-  // let checkResultItem = checkResult.find(obj => obj.scriptType === scriptType)
-  // let flag = -1
-  // if (checkResultItem) {
-  //   let device = checkResultItem.devices.find(obj => obj.deviceId === item.deviceId)
-  //   if (device) {
-  //     let chnResult = device.chnResult
-  //     if (chnNum === -1) {
-  //       if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.TIMEOUT) !== -1) {
-  //         flag = 0
-  //       }
-  //       if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.ERRORDATA) !== -1) {
-  //         flag = 1
-  //       }
-  //     } else {
-  //       if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.TIMEOUT) {
-  //         flag = 0
-  //       }
-  //       if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.ERRORDATA) {
-  //         flag = 1
-  //       }
-  //     }
-  //   }
-  // }
-
-  // if (flag === 0) {
-  //   ElMessageBox.alert('连接超时，请检查设备通讯是否正常', '连接超时', {
-  //     confirmButtonText: '确定',
-  //     type: 'warning',
-  //   })
-  // }
-  // if (flag === -1 || flag === 1) {
-  //   checkStore.setShowDetailType(2)
-    console.log('handleTest',item.deviceId,chnNum,scriptType)
-    dataCheckSingleChannelSingleTestPopupRef.value?.open(item.deviceId, chnNum + '', scriptType);
-  //}
-};
+    // let checkResultItem = checkResult.find(obj => obj.scriptType === scriptType)
+    // let flag = -1
+    // if (checkResultItem) {
+    //   let device = checkResultItem.devices.find(obj => obj.deviceId === item.deviceId)
+    //   if (device) {
+    //     let chnResult = device.chnResult
+    //     if (chnNum === -1) {
+    //       if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.TIMEOUT) !== -1) {
+    //         flag = 0
+    //       }
+    //       if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.ERRORDATA) !== -1) {
+    //         flag = 1
+    //       }
+    //     } else {
+    //       if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.TIMEOUT) {
+    //         flag = 0
+    //       }
+    //       if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.ERRORDATA) {
+    //         flag = 1
+    //       }
+    //     }
+    //   }
+    // }
 
+    // if (flag === 0) {
+    //   ElMessageBox.alert('连接超时，请检查设备通讯是否正常', '连接超时', {
+    //     confirmButtonText: '确定',
+    //     type: 'warning',
+    //   })
+    // }
+    // if (flag === -1 || flag === 1) {
+    //   checkStore.setShowDetailType(2)
+    console.log('handleTest', item.deviceId, chnNum, scriptType)
+    dataCheckSingleChannelSingleTestPopupRef.value?.open(item.deviceId, chnNum + '', scriptType)
+    //}
+}
 
 const handlePause = () => {
-  //emit('sendPause')
-  testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：当前测试小项正在执行中，将在该小项执行结束后暂停...`})
+    //emit('sendPause')
+    testLogList.push({
+        type: 'error',
+        log: `${new Date().toLocaleString()}：当前测试小项正在执行中，将在该小项执行结束后暂停...`
+    })
+}
+const initializeParameters = () => {
+    percentage.value = 0
+    testLogList.splice(0, testLogList.length, { type: 'info', log: '暂无数据，等待检测开始' })
 }
 
 const pauseSuccessCallback = () => {
-  endData.value = new Date();
-  let diffTime = endData.value.getTime() - startData.value.getTime();
-  timeDifference.value += diffTime
+    endData.value = new Date()
+    let diffTime = endData.value.getTime() - startData.value.getTime()
+    timeDifference.value += diffTime
 
-  testLogList.push({
-    type: 'info',
-    log: `${new Date().toLocaleString()}：暂停检测`,
-  })
-  stopTimeCount()
-  console.log('暂停中')
-};
+    testLogList.push({
+        type: 'info',
+        log: `${new Date().toLocaleString()}：暂停检测`
+    })
 
+    console.log('暂停中')
+}
 
 const handleResumeTest = () => {
-  //activeIndex++
-  startData.value = new Date();
-  testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：开始重新检测！`})
-  //startTimer()
-  resumeTimeCount()
-  console.log('开始继续检测')
-};
+    //activeIndex++
+    startData.value = new Date()
+    testLogList.push({ type: 'info', log: `${new Date().toLocaleString()}：开始重新检测！` })
+    //startTimer()
+    console.log('开始继续检测')
+}
+//
+onMounted(() => {
+    initializeParameters()
+})
 
 defineExpose({
-  handlePause
+    initializeParameters,
+    handlePause,
+    showTestLog,
+    startTimeCount
 })
 </script>
 
 <style scoped lang="scss">
-
 :deep(.el-table .header-row) {
-  background-color: #f5f7fa;
+    background-color: #f5f7fa;
 }
 
 :deep(.el-table .warning-row) {
-  color: red;
+    color: red;
 }
 
-
-
 .el-table .success-row {
-  --el-table-tr-bg-color: var(--el-color-success-light-9);
+    --el-table-tr-bg-color: var(--el-color-success-light-9);
 }
 
 .dialog {
-  display: flex;
-  flex-direction: column;
-  overflow-y: hidden;
-  overflow-x: hidden;
+    display: flex;
+    flex-direction: column;
+    overflow-y: hidden;
+    overflow-x: hidden;
 }
 
 .dialog-title {
-
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-right: 10px;
-  margin-bottom: 10px;
-
-  .timeView {
     display: flex;
+    justify-content: space-between;
     align-items: center;
-    color: #91cc75;
-    width: 28%;
-    margin-right: 0px;
-    text-align: left;
-    font-size: 26px;
-    font-weight: bold;
-  }
+    margin-right: 10px;
+    margin-bottom: 10px;
+
+    .timeView {
+        display: flex;
+        align-items: center;
+        color: #91cc75;
+        width: 28%;
+        margin-right: 0px;
+        text-align: left;
+        font-size: 26px;
+        font-weight: bold;
+    }
 }
 
 .dialog-content {
-  max-height: 450px;
-  overflow-y: hidden;
+    max-height: 450px;
+    overflow-y: hidden;
 }
 
 :deep(.el-collapse-item__header) {
-  height: 30px;
+    height: 30px;
 }
 
 .dialog-log {
-  height: 50px;
-  overflow-y: hidden;
+    height: 50px;
+    overflow-y: hidden;
 
-  p {
-    margin: 5px 0;
-    font-size: 14px;
-  }
+    p {
+        margin: 5px 0;
+        font-size: 14px;
+    }
 }
 
 .drawer-container {
-  :deep(header.el-drawer__header) {
-    color: #fff !important;
-    background-color: var(--el-color-primary) !important;
+    :deep(header.el-drawer__header) {
+        color: #fff !important;
+        background-color: var(--el-color-primary) !important;
 
-    .el-drawer__close-btn svg:hover {
-      color: #ccc !important;
-    }
+        .el-drawer__close-btn svg:hover {
+            color: #ccc !important;
+        }
 
-    .el-drawer__title {
-      color: #fff !important;
+        .el-drawer__title {
+            color: #fff !important;
+        }
     }
-  }
 }
 
 .loading-box {
-  animation: loading 1.5s linear infinite;
+    animation: loading 1.5s linear infinite;
 }
 
 @keyframes loading {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
 }
-
 </style>
 
 <style lang="scss" scoped>
 :deep(.el-button--small) {
-  height: 20px !important;
-  width: 20px !important;
+    height: 20px !important;
+    width: 20px !important;
 }
 
-:deep(.el-table--default  td ) {
-  padding: 5px 0 !important;
+:deep(.el-table--default td) {
+    padding: 5px 0 !important;
 }
-
-
 </style>
diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue
index 4f800f8..70eb0fa 100644
--- a/frontend/src/views/home/components/compareTestPopup.vue
+++ b/frontend/src/views/home/components/compareTestPopup.vue
@@ -1,141 +1,207 @@
 <template>
-  <el-dialog :title="dialogTitle" width="1550px" :model-value="dialogVisible" :before-close="beforeClose" @close="handleClose" height="1000px" draggable>
+    <el-dialog
+        :title="dialogTitle"
+        width="1550px"
+        :model-value="dialogVisible"
+        :before-close="beforeClose"
+        @close="handleClose"
+        height="1000px"
+        draggable
+    >
+        <div class="steps-container">
+            <el-steps
+                v-if="showSteps"
+                class="test-head-steps"
+                simple
+                :active="stepsActiveIndex"
+                process-status="finish"
+                finish-status="success"
+            >
+                <el-step
+                    v-if="preTestSelected"
+                    title="预检测"
+                    :icon="stepsActive > 1 || stepsActiveIndex > stepsTotalNum - 1 ? SuccessFilled : Edit"
+                    @click="handleStepClick(1)"
+                />
 
-    <div class="steps-container">
-      <el-steps v-if="showSteps" class="test-head-steps" simple :active="stepsActiveIndex" process-status="finish" finish-status="success">
-        <el-step v-if="preTestSelected" title="预检测" :icon="stepsActive > 1 || stepsActiveIndex > stepsTotalNum - 1? SuccessFilled : Edit" @click="handleStepClick(1)"/>
+                <el-step
+                    v-if="testSelected"
+                    title="正式检测"
+                    :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum - 1 ? SuccessFilled : Coin"
+                    @click="handleStepClick(2)"
+                />
+                <el-step title="检测完成" :icon="stepsActiveIndex > stepsTotalNum - 1 ? SuccessFilled : Key" />
+            </el-steps>
+        </div>
 
-        <el-step v-if="testSelected" title="正式检测" :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum - 1? SuccessFilled : Coin" @click="handleStepClick(2)"/>
-        <el-step title="检测完成" :icon="stepsActiveIndex > stepsTotalNum - 1 ? SuccessFilled : Key"/>
-      </el-steps>
-    </div>
+        <keep-alive>
+            <ComparePreTest
+                v-if="preTestSelected && stepsActiveView == 1"
+                ref="preTestRef"
+                v-model:testStatus="preTestStatus"
+                :webMsgSend="webMsgSend"
+                :mapping="channelMapping"
+            />
+        </keep-alive>
+        <keep-alive>
+            <CompareTest
+                v-if="testSelected && stepsActiveView == 2"
+                ref="testRef"
+                :webMsgSend="webMsgSend"
+                v-model:testStatus="TestStatus"
+                :stepsActive="stepsActive"
+            />
+        </keep-alive>
 
-    <keep-alive>
-        <ComparePreTest v-if="preTestSelected && stepsActiveView==1"  ref="preTestRef" v-model:testStatus="preTestStatus"
-             :webMsgSend="webMsgSend" :mapping = "channelMapping"/>
-    </keep-alive>
-     <keep-alive>
-        <CompareTest v-if="testSelected && stepsActiveView==2" ref="testRef" v-model:testStatus="TestStatus" 
-          :stepsActive="stepsActive"/>
-     </keep-alive>
-   
-    <template #footer>
-      <div>
-        <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmitFast">开始检测</el-button>
-        <el-button type="primary" v-if="TestStatus === 'test_init'" disabled>
-          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
-            <component :is="Refresh"/>
-          </el-icon>
-          初始化中
-        </el-button>
-        <el-button
-            type="primary"
-            v-if="TestStatus=='process'"
-            :icon="VideoPause"
-            @click="handlePause()">停止检测
-        </el-button>
-        <el-button type="warning" v-if="TestStatus === 'paused_ing'" disabled>
-          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
-            <component :is="Refresh"/>
-          </el-icon>
-          暂停中
-        </el-button>
-        <el-button
-            type="warning"
-            v-if="(TestStatus =='paused')"
-            :icon="VideoPlay"
-            @click="sendResume"
-        >继续检测
-        </el-button>
-        <el-button type="warning" :icon="VideoPlay" 
-                    v-if="nextStepText !== '下一步' && (ActiveStatue === 'success'||ActiveStatue==='error'||ActiveStatue==='test_init_fail'||ActiveStatue==='connect_timeout'||ActiveStatue==='pause_timeout')"
-        @click="handleSubmitAgain">重新检测
-        </el-button>
-        <el-button :type="ActiveStatue==='success'?'primary':'danger'" :icon="Right"
-                   v-if="nextStepText !== '下一步' && (ActiveStatue === 'success'||ActiveStatue==='error'||ActiveStatue==='test_init_fail'||ActiveStatue==='connect_timeout'||ActiveStatue==='pause_timeout')"
-                   @click="nextStep">
-          {{ nextStepText }}
-        </el-button>
-        <el-button type="primary" @click="handleQuit" v-else>
-          退出检测
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <div>
+                <el-button
+                    type="primary"
+                    :icon="VideoPlay"
+                    v-if="ActiveStatue === 'waiting' && !(testSelected && stepsActiveIndex == 2)"
+                    @click="handleSubmitFast"
+                >
+                    开始检测
+                </el-button>
+                <el-button type="primary" v-if="TestStatus === 'test_init'" disabled>
+                    <el-icon class="loading-box" style="color: #fff; margin-right: 8px">
+                        <component :is="Refresh" />
+                    </el-icon>
+                    初始化中
+                </el-button>
+                <el-button type="primary" v-if="TestStatus == 'process'" :icon="VideoPause" @click="handlePause()">
+                    停止检测
+                </el-button>
+                <el-button type="warning" v-if="TestStatus === 'paused_ing'" disabled>
+                    <el-icon class="loading-box" style="color: #fff; margin-right: 8px">
+                        <component :is="Refresh" />
+                    </el-icon>
+                    暂停中
+                </el-button>
+                <el-button type="warning" v-if="TestStatus == 'paused'" :icon="VideoPlay" @click="sendResume">
+                    继续检测
+                </el-button>
+
+                <el-button
+                    type="warning"
+                    :icon="VideoPlay"
+                    v-if="
+                        nextStepText !== '下一步' &&
+                        (ActiveStatue === 'success' ||
+                            ActiveStatue === 'error' ||
+                            ActiveStatue === 'test_init_fail' ||
+                            ActiveStatue === 'connect_timeout' ||
+                            ActiveStatue === 'pause_timeout' ||
+                            ActiveStatue === 'waiting')
+                    "
+                    @click="handleSubmitAgain"
+                >
+                    重新检测
+                </el-button>
+                <el-button
+                    :type="ActiveStatue === 'success' ? 'primary' : 'danger'"
+                    :icon="Right"
+                    v-if="
+                        nextStepText !== '下一步' &&
+                        (ActiveStatue === 'success' ||
+                            ActiveStatue === 'error' ||
+                            ActiveStatue === 'test_init_fail' ||
+                            ActiveStatue === 'connect_timeout' ||
+                            ActiveStatue === 'pause_timeout')
+                    "
+                    @click="nextStep"
+                >
+                    {{ nextStepText }}
+                </el-button>
+                <el-button type="primary" @click="handleQuit" v-else>退出检测</el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="tsx" setup name="testPopup">
-import {nextTick, reactive, ref, watch} from 'vue';
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {Coin, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPause, VideoPlay} from '@element-plus/icons-vue'
+import { nextTick, reactive, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import {
+    Coin,
+    Edit,
+    Key,
+    Odometer,
+    Refresh,
+    Right,
+    SuccessFilled,
+    UploadFilled,
+    VideoPause,
+    VideoPlay
+} from '@element-plus/icons-vue'
 import ComparePreTest from './comparePreTest.vue'
 import CompareTest from './compareTest.vue'
-import socketClient from '@/utils/webSocketClient';
-import {useCheckStore} from "@/stores/modules/check";
-import {pauseTest, resumeTest, startPreTest,contrastTest} from '@/api/socket/socket'
-import {useUserStore} from "@/stores/modules/user";
-import {JwtUtil} from "@/utils/jwtUtil";
-
+import socketClient from '@/utils/webSocketClient'
+import { useCheckStore } from '@/stores/modules/check'
+import { pauseTest, resumeTest, startPreTest, contrastTest } from '@/api/socket/socket'
+import { useUserStore } from '@/stores/modules/user'
+import { JwtUtil } from '@/utils/jwtUtil'
+// import {JwtUtil} from "@/utils/check";
 
 const userStore = useUserStore()
-const checkStore = useCheckStore();
-const nextStepText = ref('下一步');
+const checkStore = useCheckStore()
+
+const nextStepText = ref('下一步')
 const dialogVisible = ref(false)
 
 const showSteps = ref(false)
-const stepsTotalNum = ref(-1);//步骤总数
-const stepsActiveIndex = ref(1); //当前正在执行的步骤索引
-const stepsActiveView = ref(1); //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，仅用于页面显示
-const stepsActive = ref(-1); //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，实际记录步骤的状态，用于切换步骤
-const ActiveStatue = ref('waiting');//当前步骤状态
-const preTestStatus = ref('waiting');//预检测执行状态
-const TestStatus = ref('waiting');//正式检测执行状态
-const webMsgSend = ref();//webSocket推送的数据
-
+const stepsTotalNum = ref(-1) //步骤总数
+const stepsActiveIndex = ref(1) //当前正在执行的步骤索引
+const stepsActiveView = ref(1) //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，仅用于页面显示
+const stepsActive = ref(-1) //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，实际记录步骤的状态，用于切换步骤
+const ActiveStatue = ref('waiting') //当前步骤状态
+const preTestStatus = ref('waiting') //预检测执行状态
+const TestStatus = ref('waiting') //正式检测执行状态
+const webMsgSend = ref() //webSocket推送的数据
 
 const dialogTitle = ref('')
 const showComponent = ref(true)
 const preTestRef = ref<InstanceType<typeof ComparePreTest> | null>(null)
-const testRef = ref(null)
+const testRef: any = ref(null)
 
 const dataSocket = reactive({
-  socketServe: socketClient.Instance,
-});
+    socketServe: socketClient.Instance
+})
 
 // 勾选的检测内容
 const preTestSelected = ref(true)
 const testSelected = ref(false)
 
 const initOperate = () => {
-  ActiveStatue.value = 'waiting'
-  preTestStatus.value = 'waiting'
+    ActiveStatue.value = 'waiting'
+    preTestStatus.value = 'waiting'
 
-  TestStatus.value = 'waiting'
+    TestStatus.value = 'waiting'
 
-  stepsActiveIndex.value = 1
-  showComponent.value = true
-  // 初始化勾选的检测内容
-  preTestSelected.value = checkStore.selectTestItems.preTest
-  testSelected.value = checkStore.selectTestItems.test
+    stepsActiveIndex.value = 1
+    showComponent.value = true
+    // 初始化勾选的检测内容
+    preTestSelected.value = checkStore.selectTestItems.preTest
+    testSelected.value = checkStore.selectTestItems.test
 
-  let count = 0
-  for (let key in checkStore.selectTestItems) {
-    if (checkStore.selectTestItems[key]) {
-      count++
+    let count = 0
+    for (let key in checkStore.selectTestItems) {
+        if (checkStore.selectTestItems[key]) {
+            count++
+        }
     }
-  }
-  stepsTotalNum.value = count + 1
+    stepsTotalNum.value = count + 1
 
-  if (preTestSelected.value) {
-    stepsActiveView.value = 1
-    stepsActive.value = 1
-    return
-  }
-  if (testSelected.value) {
-    stepsActiveView.value = 2
-    stepsActive.value = 2
-    return
-  }
+    if (preTestSelected.value) {
+        stepsActiveView.value = 1
+        stepsActive.value = 1
+        return
+    }
+    if (testSelected.value) {
+        stepsActiveView.value = 2
+        stepsActive.value = 2
+        return
+    }
 }
 
 const channelMapping = ref<Record<string, Record<string, string>>>({})
@@ -144,377 +210,426 @@ const loginName = ref('')
 const devIds = ref<[]>()
 const standardDevIds = ref<[]>()
 const pairs = ref<any>()
-const testAgain = ref(false)//重新检测按钮是否显示
-const checkNumber = ref(0)//检测次数
-const open = async (title: string,mapping:any,plan: string,login: string,devIdsArray: [],standardDevIdsArray: [],pair:any) => {
-  if(checkStore.selectTestItems.preTest && !checkStore.selectTestItems.test){
-    testAgain.value = true
-  }
-  channelMapping.value = mapping
-  planId.value = plan
-  loginName.value = login
-  devIds.value = devIdsArray
-  standardDevIds.value = standardDevIdsArray
-  pairs.value = pair
-  showSteps.value = true
-  initOperate()
-  dialogTitle.value = title;
-  dialogVisible.value = true;
-
-  // 等待组件渲染完成
-  await nextTick();
-    
-  if (preTestRef.value) {
-    preTestRef.value.initializeParameters();
-  }
-
-  //开始创建webSocket客户端
-  socketClient.Instance.connect();
-  dataSocket.socketServe = socketClient.Instance;
-  dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
-    console.log('Received message:', res)
-    // 处理来自服务器的消息
-    if (res.code === 20000) {
-      //ElMessage.error(message.message)
-      // loading.close()
-    } else {
-      webMsgSend.value = res
+const testAgain = ref(false) //重新检测按钮是否显示
+const checkNumber = ref(0) //检测次数
+const open = async (
+    title: string,
+    mapping: any,
+    plan: string,
+    login: string,
+    devIdsArray: [],
+    standardDevIdsArray: [],
+    pair: any
+) => {
+    if (checkStore.selectTestItems.preTest && !checkStore.selectTestItems.test) {
+        testAgain.value = true
     }
-  });
+    channelMapping.value = mapping
+    planId.value = plan
+    loginName.value = login
+    devIds.value = devIdsArray
+    standardDevIds.value = standardDevIdsArray
+    pairs.value = pair
+    showSteps.value = true
+    initOperate()
+    dialogTitle.value = title
+    dialogVisible.value = true
+
+    // 等待组件渲染完成
+    await nextTick()
+
+    if (preTestRef.value) {
+        preTestRef.value.initializeParameters()
+    }
+
+    //开始创建webSocket客户端
+    socketClient.Instance.connect()
+    dataSocket.socketServe = socketClient.Instance
+    dataSocket.socketServe.registerCallBack('aaa', (res: { code: number }) => {
+        // console.log('Received message:', res)
+        // 处理来自服务器的消息
+        if (res.code === 20000) {
+            //ElMessage.error(message.message)
+            // loading.close()
+        } else {
+            webMsgSend.value = res
+        }
+    })
 }
 
 //预检测-重新检测
-const handleSubmitAgain = async () => { 
+const handleSubmitAgain = async () => {
     stepsActiveIndex.value = 1
     stepsActiveView.value = 1
     stepsActive.value = 1
     let count = 0
     for (let key in checkStore.selectTestItems) {
-      if (checkStore.selectTestItems[key]) {
-        count++
-      }
+        if (checkStore.selectTestItems[key]) {
+            count++
+        }
     }
     stepsTotalNum.value = count + 1
 
-     // 通知子组件清空并重新初始化
+    // 通知子组件清空并重新初始化
     if (preTestRef.value) {
-        preTestRef.value.initializeParameters();
+        preTestRef.value.initializeParameters()
     }
-    
+    testRef.value && testRef.value.initializeParameters()
+
     // 重置状态
+    nextStepText.value = '下一步'
     ActiveStatue.value = 'waiting'
     preTestStatus.value = 'waiting'
+    TestStatus.value = 'waiting'
 
-     await contrastTest({
-          planId: planId.value,
-          loginName: loginName.value,
-          devIds: devIds.value,
-          standardDevIds: standardDevIds.value,
-          pairs:pairs.value,
-          testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test],
-       userId: userStore.userInfo.id,
-        })
+    await contrastTest({
+        planId: planId.value,
+        loginName: loginName.value,
+        devIds: devIds.value,
+        standardDevIds: standardDevIds.value,
+        pairs: pairs.value,
+        testItemList: [checkStore.selectTestItems.preTest, false, checkStore.selectTestItems.test],
+
+        userId: userStore.userInfo.id
+    })
 
     preTestStatus.value = 'start'
-};
+}
 
 //开始检测
 const handleSubmitFast = async () => {
-  if (!dataSocket.socketServe.connected) {
-    ElMessage.error('webSocket连接中断！')
-    return
-  }
+    if (!dataSocket.socketServe.connected) {
+        ElMessage.error('webSocket连接中断！')
+        return
+    }
 
-  switch (stepsActive.value) {
-    case 1:
-      if (preTestStatus.value == 'waiting') {
-        if (checkStore.selectTestItems.preTest) {
-        await contrastTest({
-          planId: planId.value,
-          loginName: loginName.value,
-          devIds: devIds.value,
-          standardDevIds: standardDevIds.value,
-          pairs:pairs.value,
-          testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test],
-          userId: userStore.userInfo.id,
-        })
-          preTestStatus.value = 'start'
-        }
-      }
-      break;
-    case 2:
-      if (TestStatus.value == "waiting") {
-           // 如果没有预检测,直接进行正式检测需要先初始化
-        if (!checkStore.selectTestItems.preTest  && checkStore.selectTestItems.test) {
-          await contrastTest({
-          planId: planId.value,
-          loginName: loginName.value,
-          devIds: devIds.value,
-          standardDevIds: standardDevIds.value,
-          pairs:pairs.value,
-          testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test],
-            userId: userStore.userInfo.id,
-        })
-        }
-        TestStatus.value = 'start'
-      } else if (TestStatus.value == 'paused') {
-        // 发送继续指令
-        //sendResume()
-      }
-      break;
-    default:
-      break;
-  }
+    switch (stepsActive.value) {
+        case 1:
+            if (preTestStatus.value == 'waiting') {
+                if (checkStore.selectTestItems.preTest) {
+                    await contrastTest({
+                        planId: planId.value,
+                        loginName: loginName.value,
+                        devIds: devIds.value,
+                        standardDevIds: standardDevIds.value,
+                        pairs: pairs.value,
+                        testItemList: [checkStore.selectTestItems.preTest, false, checkStore.selectTestItems.test],
+
+                        userId: userStore.userInfo.id
+                    })
+                    preTestStatus.value = 'start'
+                    if (checkStore.selectTestItems.test) {
+                        testRef.value.initializeParameters()
+                        testRef.value.showTestLog()
+                    }
+                }
+            }
+            break
+        case 2:
+            if (TestStatus.value == 'waiting') {
+                // 如果没有预检测,直接进行正式检测需要先初始化
+                if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.test) {
+                    await contrastTest({
+                        planId: planId.value,
+                        loginName: loginName.value,
+                        devIds: devIds.value,
+                        standardDevIds: standardDevIds.value,
+                        pairs: pairs.value,
+                        testItemList: [checkStore.selectTestItems.preTest, false, checkStore.selectTestItems.test],
+
+                        userId: userStore.userInfo.id
+                    })
+                }
+                TestStatus.value = 'start'
+            } else if (TestStatus.value == 'paused') {
+                // 发送继续指令
+                //sendResume()
+            }
+            break
+        default:
+            break
+    }
 }
 
-
-
 const emit = defineEmits<{
-  (e: 'quitClicked'): void;
-}>();
+    (e: 'quitClicked'): void
+}>()
 
 watch(preTestStatus, function (newValue, oldValue) {
-  console.log('预检测状态',newValue, oldValue);
-  ActiveStatue.value = newValue
+    console.log('预检测状态', newValue, oldValue)
+    ActiveStatue.value = newValue
 })
 
 watch(TestStatus, function (newValue, oldValue) {
-  console.log('正式检测状态',newValue, oldValue);
+    console.log('正式检测状态', newValue, oldValue)
 
-  ActiveStatue.value = newValue
+    ActiveStatue.value = newValue
 })
 
 watch(stepsActiveIndex, function (newValue, oldValue) {
-  console.log('步骤索引',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(() => {
+            testRef.value.initializeParameters()
+            testRef.value.showTestLog()
+            testRef.value.startTimeCount()
+        }, 500)
+    }
+    console.log('步骤索引', newValue, oldValue)
 })
 
 watch(ActiveStatue, function (newValue, oldValue) {
-  console.log('当前步骤状态-----',newValue);
-   console.log('stepsActiveIndex-----',stepsActiveIndex.value);
-    console.log('stepsTotalNum----',stepsTotalNum.value);
-  if (newValue === 'error') {
-    stepsActiveIndex.value = stepsTotalNum.value + 1
-    nextStepText.value = '检测失败'
-  }
-  if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 1) {
-    stepsActiveIndex.value += 2
-    nextStepText.value = '检测完成'
-  }
-  if (newValue === 'test_init_fail') {
-    stepsActiveIndex.value += 2
-    nextStepText.value = '初始化失败'
-  }
-  if (newValue === 'connect_timeout') {
-    stepsActiveIndex.value += 2
-    nextStepText.value = '连接超时'
-  }
-  if (newValue === 'pause_timeout') {
-    stepsActiveIndex.value += 2
-    // nextStepText.value = '结束测试'
-    nextStepText.value = '暂停超时'
-  }
-  if (newValue === 'success' && stepsActiveIndex.value < stepsTotalNum.value - 1) {
-    nextStep() // 实现自动点击，进入下一个测试内容
-    //handleSubmitFast()
-  }
-
+    console.log('当前步骤状态-----', newValue)
+    console.log('stepsActiveIndex-----', stepsActiveIndex.value)
+    console.log('stepsTotalNum----', stepsTotalNum.value)
+    if (newValue === 'error') {
+        stepsActiveIndex.value = stepsTotalNum.value + 1
+        nextStepText.value = '检测失败'
+    }
+    if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 1) {
+        stepsActiveIndex.value += 2
+        nextStepText.value = '检测完成'
+        console.log('🚀 ~ nextStepText.value:', nextStepText.value)
+    }
+    if (newValue === 'test_init_fail') {
+        stepsActiveIndex.value += 2
+        nextStepText.value = '初始化失败'
+    }
+    if (newValue === 'connect_timeout') {
+        stepsActiveIndex.value += 2
+        nextStepText.value = '连接超时'
+    }
+    if (newValue === 'pause_timeout') {
+        stepsActiveIndex.value += 2
+        // nextStepText.value = '结束测试'
+        nextStepText.value = '暂停超时'
+    }
+    if (newValue === 'success' && stepsActiveIndex.value < stepsTotalNum.value - 1) {
+        nextStep() // 实现自动点击，进入下一个测试内容
+        //handleSubmitFast()
+    }
 })
 
 const handleQuit = () => {
-  console.log('handleQuit', ActiveStatue.value)
-  if (ActiveStatue.value !== 'success' && ActiveStatue.value !== 'waiting' && ActiveStatue.value !== 'paused' && ActiveStatue.value !== 'test_init_fail' && ActiveStatue.value !== 'connect_timeout' && ActiveStatue.value !== 'pause_timeout') {
-    beforeClose(() => {
-    })
-  } else {
-    handleClose()
-  }
+    console.log('handleQuit', ActiveStatue.value)
+    if (
+        ActiveStatue.value !== 'success' &&
+        ActiveStatue.value !== 'waiting' &&
+        ActiveStatue.value !== 'paused' &&
+        ActiveStatue.value !== 'test_init_fail' &&
+        ActiveStatue.value !== 'connect_timeout' &&
+        ActiveStatue.value !== 'pause_timeout'
+    ) {
+        beforeClose(() => {})
+    } else {
+        handleClose()
+    }
 }
 
-
 const handlePause = () => {
-  sendPause()
-  testRef.value?.handlePause()
+    sendPause()
+    testRef.value?.handlePause()
 }
 const sendPause = () => {
-  console.log('发起暂停请求')
+    console.log('发起暂停请求')
 
-  TestStatus.value = 'paused_ing'
-  pauseTest()
+    TestStatus.value = 'paused_ing'
+    pauseTest()
 }
 const sendResume = () => {
-  console.log('发起继续检测请求')
+    console.log('发起继续检测请求')
 
-  resumeTest({
-    userPageId: "cdf",
-    devIds: checkStore.devices.map((item) => item.deviceId),
-    planId: checkStore.plan.id,
-    reCheckType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-    userId: userStore.userInfo.id,
-    temperature: checkStore.temperature,
-    humidity: checkStore.humidity
-  })
-  Object.assign(webMsgSend.value, {
-    requestId: 'Resume_Success'
-  })
+    resumeTest({
+        userPageId: 'cdf',
+        devIds: checkStore.devices.map(item => item.deviceId),
+        planId: checkStore.plan.id,
+        reCheckType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+        userId: userStore.userInfo.id,
+        temperature: checkStore.temperature,
+        humidity: checkStore.humidity
+    })
+    Object.assign(webMsgSend.value, {
+        requestId: 'Resume_Success'
+    })
 }
 
 const sendReCheck = () => {
-  console.log('发送重新检测指令')
-  startPreTest({
-    userPageId: JwtUtil.getLoginName(),
-    devIds: checkStore.devices.map((item) => item.deviceId),
-    planId: checkStore.plan.id,
-    reCheckType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-    userId: userStore.userInfo.id,
-    temperature: checkStore.temperature,
-    humidity: checkStore.humidity,
-    testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
-  }).then(res => {
-    console.log(res)
-    if (res.code === 'A001014') {
-      ElMessageBox.alert('装置配置异常', '初始化失败', {
-        confirmButtonText: '确定',
-        type: 'error',
-      })
-      TestStatus.value = 'test_init_fail'
-    }
-  })
-  TestStatus.value = 'start'
+    console.log('发送重新检测指令')
+    startPreTest({
+        userPageId: JwtUtil.getLoginName(),
+        devIds: checkStore.devices.map(item => item.deviceId),
+        planId: checkStore.plan.id,
+        reCheckType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+        userId: userStore.userInfo.id,
+        temperature: checkStore.temperature,
+        humidity: checkStore.humidity,
+        testItemList: [
+            checkStore.selectTestItems.preTest,
+            checkStore.selectTestItems.channelsTest,
+            checkStore.selectTestItems.test
+        ]
+    }).then(res => {
+        console.log(res)
+        if (res.code === 'A001014') {
+            ElMessageBox.alert('装置配置异常', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error'
+            })
+            TestStatus.value = 'test_init_fail'
+        }
+    })
+    TestStatus.value = 'start'
 }
 
 const closeWebSocket = () => {
-  dataSocket.socketServe.closeWs()
+    dataSocket.socketServe.closeWs()
 }
 
 const nextStep = () => {
-  if (stepsActiveIndex.value == stepsTotalNum.value + 1 || ActiveStatue.value === 'error' || ActiveStatue.value === 'test_init_fail' || ActiveStatue.value === 'connect_timeout' || ActiveStatue.value === 'pause_timeout') {
-    handleClose()
-    return
-  }
-  if (ActiveStatue.value != 'error') {
-    ActiveStatue.value = 'waiting'
-    let tempStep = stepsActiveIndex.value
-    let idx = -1
-    stepsActiveIndex.value++
-    for (let selectTestItemsKey in checkStore.selectTestItems) {
-      if (tempStep == 0 && checkStore.selectTestItems[selectTestItemsKey]) {
-        console.log('selectTestItemsKey1')
-        stepsActiveView.value = idx
-        stepsActive.value = idx
-        console.log('stepsActiveView.value999', stepsActiveView.value)
+    if (
+        stepsActiveIndex.value == stepsTotalNum.value + 1 ||
+        ActiveStatue.value === 'error' ||
+        ActiveStatue.value === 'test_init_fail' ||
+        ActiveStatue.value === 'connect_timeout' ||
+        ActiveStatue.value === 'pause_timeout'
+    ) {
+        handleClose()
         return
-      }
-      if (checkStore.selectTestItems[selectTestItemsKey] && tempStep != 0) {
-        console.log('selectTestItemsKey2')
-        tempStep--
-      }
-      console.log('selectTestItemsKey3',idx)
-      idx++
     }
-  }
+    if (ActiveStatue.value != 'error') {
+        ActiveStatue.value = 'waiting'
+        let tempStep = stepsActiveIndex.value
+        let idx = -1
+        stepsActiveIndex.value++
+        for (let selectTestItemsKey in checkStore.selectTestItems) {
+            if (tempStep == 0 && checkStore.selectTestItems[selectTestItemsKey]) {
+                console.log('selectTestItemsKey1')
+                stepsActiveView.value = idx
+                stepsActive.value = idx
+
+                return
+            }
+            if (checkStore.selectTestItems[selectTestItemsKey] && tempStep != 0) {
+                console.log('selectTestItemsKey2')
+                tempStep--
+            }
+            console.log('selectTestItemsKey3', idx)
+            idx++
+        }
+    }
 }
 
 const handleStepClick = (step: number) => {
-  if (step > stepsActive.value) {
-    return
-  } else {
-    stepsActiveView.value = step
-  }
+    if (step > stepsActive.value) {
+        return
+    } else {
+        stepsActiveView.value = step
+    }
 }
 
 function clearData() {
-  stepsTotalNum.value = -1
-  stepsActiveIndex.value = 1
-  stepsActiveView.value = -1
-  preTestStatus.value = "waiting"
-  TestStatus.value = "waiting"
-  ActiveStatue.value = "waiting"
-  nextStepText.value = "下一步"
+    stepsTotalNum.value = -1
+    stepsActiveIndex.value = 1
+    stepsActiveView.value = -1
+    preTestStatus.value = 'waiting'
+    TestStatus.value = 'waiting'
+    ActiveStatue.value = 'waiting'
+    nextStepText.value = '下一步'
 }
 
 const beforeClose = (done: () => void) => {
-  if (stepsActiveIndex.value < stepsTotalNum.value && ActiveStatue.value != 'error') {
-    ElMessageBox.confirm('检测未完成，是否退出当前检测流程?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }
-    ).then(() => {
-      handleClose()
-    })
-  } else {
-    handleClose()
-  }
+    if (stepsActiveIndex.value < stepsTotalNum.value && ActiveStatue.value != 'error') {
+        ElMessageBox.confirm('检测未完成，是否退出当前检测流程?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            handleClose()
+        })
+    } else {
+        handleClose()
+    }
 }
 
 const handleClose = () => {
-  showSteps.value = false
-  dataSocket.socketServe.closeWs()
-  dialogVisible.value = false;
-  clearData()
-  showComponent.value = false;
+    showSteps.value = false
+    dataSocket.socketServe.closeWs()
+    dialogVisible.value = false
+    clearData()
+    showComponent.value = false
 
-  emit('quitClicked'); // 触发事件
+    emit('quitClicked') // 触发事件
 }
 
 // 对外映射
-defineExpose({open})
+defineExpose({ open })
 </script>
 
 <style scoped lang="scss">
-
 .test-head-steps {
-  ::v-deep .el-step {
-    .el-step__head.is-success {
-      color: #91cc75;
-    }
+    ::v-deep .el-step {
+        .el-step__head.is-success {
+            color: #91cc75;
+        }
 
-    .el-step__title.is-success {
-      color: #91cc75;
+        .el-step__title.is-success {
+            color: #91cc75;
+        }
     }
-  }
 }
 
 :deep(.dialog-big .el-dialog__body) {
-  max-height: 840px !important;
+    max-height: 840px !important;
 }
 
 .steps-container :deep(.test-head-steps) {
-  height: 80px;
-  margin-bottom: 10px;
+    height: 80px;
+    margin-bottom: 10px;
 }
 
 .steps-container :deep(.el-step__title) {
-  font-size: 20px !important; /* 设置标题字体大小 */
-  vertical-align: baseline !important;
-  display: inline-block; /* 确保文字和图标在同一行 */
-  line-height: 1; /* 调整行高以确保底部对齐 */
+    font-size: 20px !important;
+    /* 设置标题字体大小 */
+    vertical-align: baseline !important;
+    display: inline-block;
+    /* 确保文字和图标在同一行 */
+    line-height: 1;
+    /* 调整行高以确保底部对齐 */
 }
 
 .steps-container :deep(.el-step__icon-inner) {
-  font-size: 18px !important;
-  vertical-align: baseline !important;
-  display: inline-block; /* 确保文字和图标在同一行 */
-  line-height: 1; /* 调整行高以确保底部对齐 */
+    font-size: 18px !important;
+    vertical-align: baseline !important;
+    display: inline-block;
+    /* 确保文字和图标在同一行 */
+    line-height: 1;
+    /* 调整行高以确保底部对齐 */
 }
 
 .steps-container :deep(.el-step__icon) {
-  font-size: 18px !important;
-  vertical-align: baseline !important;
-  display: inline-block; /* 确保文字和图标在同一行 */
-  line-height: 1; /* 调整行高以确保底部对齐 */
+    font-size: 18px !important;
+    vertical-align: baseline !important;
+    display: inline-block;
+    /* 确保文字和图标在同一行 */
+    line-height: 1;
+    /* 调整行高以确保底部对齐 */
 }
 
 .loading-box {
-  animation: loading 1.5s linear infinite;
+    animation: loading 1.5s linear infinite;
 }
 
 @keyframes loading {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+    from {
+        transform: rotate(0deg);
+    }
+
+    to {
+        transform: rotate(360deg);
+    }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/views/home/components/deviceConnectionPopup.vue b/frontend/src/views/home/components/deviceConnectionPopup.vue
index 027e57d..14d09db 100644
--- a/frontend/src/views/home/components/deviceConnectionPopup.vue
+++ b/frontend/src/views/home/components/deviceConnectionPopup.vue
@@ -1,63 +1,63 @@
 <template>
-  <el-dialog title="设备通道配对" v-model='dialogVisible' v-bind="dialogBig" >
-    <div class="flow-container" style="overflow: hidden; position: relative" :style="{ height: dialogHeight + 'px' }">
-      <!-- <el-button @click="logConnections">打印当前配对</el-button>  -->
-      <VueFlow 
-        :nodes="nodes" 
-        :edges="edges"
-        :connection-radius="30" 
-        :nodes-draggable="false" 
-        :dragging="false"
-        :zoom-on-scroll="false" 
-        :pan-on-drag="false" 
-        :disable-zoom-pan-on-connect="true"
-        :prevent-scrolling="true"
-        :fit-view="true"
-        :min-zoom="1"
-        :max-zoom="1"
-        :elements-selectable="false"
-        auto-connect 
-        @connect="handleConnect"
-        @connect-start="handleConnectStart"
-        @connect-end="handleConnectEnd"
-        @pane-ready="onPaneReady"
-        v-on:pane-mouse-move="false"
-      >
-      </VueFlow>          
-    </div>
-    
-    <!-- 底部操作按钮 -->
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleNext">下一步</el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <el-dialog title="设备通道配对" v-model="dialogVisible" v-bind="dialogBig">
+        <div
+            class="flow-container"
+            style="overflow: hidden; position: relative"
+            :style="{ height: dialogHeight + 'px' }"
+        >
+            <!-- <el-button @click="logConnections">打印当前配对</el-button>  -->
+            <VueFlow
+                :nodes="nodes"
+                :edges="edges"
+                :connection-radius="30"
+                :nodes-draggable="false"
+                :dragging="false"
+                :zoom-on-scroll="false"
+                :pan-on-drag="false"
+                :disable-zoom-pan-on-connect="true"
+                :prevent-scrolling="true"
+                :fit-view="true"
+                :min-zoom="1"
+                :max-zoom="1"
+                :elements-selectable="false"
+                auto-connect
+                @connect="handleConnect"
+                @connect-start="handleConnectStart"
+                @connect-end="handleConnectEnd"
+                @pane-ready="onPaneReady"
+                v-on:pane-mouse-move="false"
+            ></VueFlow>
+        </div>
 
-  <!-- 手动检测-勾选检测项弹窗 -->
-  <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog" ></SelectTestItemPopup>
-  <CompareTestPopup ref='testPopup'></CompareTestPopup>
+        <!-- 底部操作按钮 -->
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="handleNext">下一步</el-button>
+            </div>
+        </template>
+    </el-dialog>
+
+    <!-- 手动检测-勾选检测项弹窗 -->
+    <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
+    <CompareTestPopup ref="testPopup"></CompareTestPopup>
 </template>
 
 <script lang="ts" setup>
 import { h, ref } from 'vue'
 import { VueFlow, useVueFlow } from '@vue-flow/core'
-import { dialogBig } from "@/utils/elementBind";
+import { dialogBig } from '@/utils/elementBind'
 import { Platform, Flag } from '@element-plus/icons-vue'
-import { Device } from '@/api/device/interface/device';
-import { StandardDevice } from '@/api/device/interface/standardDevice';
-import SelectTestItemPopup from "@/views/home/components/selectTestItemPopup.vue";
+import { Device } from '@/api/device/interface/device'
+import { StandardDevice } from '@/api/device/interface/standardDevice'
+import SelectTestItemPopup from '@/views/home/components/selectTestItemPopup.vue'
 import CompareTestPopup from './compareTestPopup.vue'
-import { ElMessage } from 'element-plus';
+import { ElMessage } from 'element-plus'
 import CustomEdge from './RemoveableEdge.vue' // 导入自定义连接线组件
-import { jwtUtil } from "@/utils/jwtUtil";
-import {useCheckStore} from "@/stores/modules/check";
+import { jwtUtil } from '@/utils/jwtUtil'
+import { useCheckStore } from '@/stores/modules/check'
 
-
-
-
-const checkStore = useCheckStore();
+const checkStore = useCheckStore()
 const dialogVisible = ref(false)
 const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
 const testPopup = ref()
@@ -67,169 +67,198 @@ const dialogHeight = ref(600)
 
 // 初始化 VueFlow，注册自定义连线类型
 const { edges, setViewport } = useVueFlow({
-  edgeTypes: {
-    default: CustomEdge
-  }
+    edgeTypes: {
+        default: CustomEdge
+    }
 })
 
 // 初始化时锁定画布位置
 const onPaneReady = () => {
-  setViewport({ x: 0, y: 0, zoom: 1 })
+    setViewport({ x: 0, y: 0, zoom: 1 })
 }
 
 // 提取公共的label渲染函数
 const createLabel = (text: string, type: string) => {
-  return h('div', {
-    style: {
-      display: 'flex',
-      flexDirection: 'column',
-      alignItems: 'center',
-      fontSize: '15px',
-      textAlign: 'center',
-      border: '1px solid #ccc',
-      borderRadius: '8px',
-      padding: '8px',
-      backgroundColor: '#f9f9f9'
-    }
-  }, [
-    h(Platform, {
-      style: {
-        width: '20px',
-        marginBottom: '4px',
-        color: '#526ade'
-      }
-    }),
-    h('div', null, '设备名称：' + text),
-    h('div', null, '设备类型：' + type)
-  ]) as any
+    return h(
+        'div',
+        {
+            style: {
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'center',
+                fontSize: '15px',
+                textAlign: 'center',
+                border: '1px solid #ccc',
+                borderRadius: '8px',
+                padding: '8px',
+                backgroundColor: '#f9f9f9'
+            }
+        },
+        [
+            h(Platform, {
+                style: {
+                    width: '20px',
+                    marginBottom: '4px',
+                    color: '#526ade'
+                }
+            }),
+            h('div', null, '设备名称：' + text),
+            h('div', null, '设备类型：' + type)
+        ]
+    ) as any
 }
 
 const createLabel3 = (text: string) => {
-  return h('div', {
-    style: {
-      display: 'flex',
-      alignItems: 'center',
-      fontSize: '15px',
-      textAlign: 'center',
-      border: '1px solid #ccc',
-      borderRadius: '8px',
-      padding: '8px',
-      backgroundColor: '#f9f9f9'
-    }
-  }, [
-    h(Flag, {
-      style: {
-        width: '20px',
-        marginRight: '4px',
-        color: '#526ade'
-      }
-    }),
-    text
-  ]) as any
+    return h(
+        'div',
+        {
+            style: {
+                display: 'flex',
+                alignItems: 'center',
+                fontSize: '15px',
+                textAlign: 'center',
+                border: '1px solid #ccc',
+                borderRadius: '8px',
+                padding: '8px',
+                backgroundColor: '#f9f9f9'
+            }
+        },
+        [
+            h(Flag, {
+                style: {
+                    width: '20px',
+                    marginRight: '4px',
+                    color: '#526ade'
+                }
+            }),
+            text
+        ]
+    ) as any
 }
 
-
 const handleConnectStart = (params: any) => {
-  onPaneReady()
+    onPaneReady()
 }
 
 const handleConnectEnd = (params: any) => {
-  onPaneReady()
+    onPaneReady()
 }
 
 const handleConnect = (params: any) => {
-  console.log('连接信息:', params);
-  const sourceNode = nodes.value.find(node => node.id === params.source)
-  const targetNode = nodes.value.find(node => node.id === params.target)
-  
-  // 连接规则验证
-  const isValidConnection = 
-    sourceNode?.type === 'input' && 
-    targetNode?.type === 'output'
+    console.log('连接信息:', params)
+    const sourceNode = nodes.value.find(node => node.id === params.source)
+    const targetNode = nodes.value.find(node => node.id === params.target)
 
-  if (!isValidConnection) {
-    removeEdge(params)
-    ElMessage.warning('只能从被检通道连接到标准通道')
-    return
-  }
+    // 连接规则验证
+    const isValidConnection = sourceNode?.type === 'input' && targetNode?.type === 'output'
 
-   // 过滤掉当前连接，检查是否还有重复的
-  const existingEdges = edges.value.filter(edge => 
-    edge.source === params.source || edge.target === params.target
-  );
-  
-  // 如果同源或同目标的连接超过1个，说明有重复
-  if (existingEdges.length > 1) {
-    const duplicateSource = existingEdges.filter(edge => edge.source === params.source).length > 1;
-    const duplicateTarget = existingEdges.filter(edge => edge.target === params.target).length > 1;
-    
-    if (duplicateSource) {
-      removeEdge(params);
-      ElMessage.warning('该被检通道已经连接，不能重复连接');
-      return;
+    if (!isValidConnection) {
+        removeEdge(params)
+        ElMessage.warning('只能从被检通道连接到标准通道')
+        return
     }
-    
-    if (duplicateTarget) {
-      removeEdge(params);
-      ElMessage.warning('该标准通道已经连接，不能重复连接');
-      return;
+
+    // 过滤掉当前连接，检查是否还有重复的
+    const existingEdges = edges.value.filter(edge => edge.source === params.source || edge.target === params.target)
+
+    // 如果同源或同目标的连接超过1个，说明有重复
+    if (existingEdges.length > 1) {
+        const duplicateSource = existingEdges.filter(edge => edge.source === params.source).length > 1
+        const duplicateTarget = existingEdges.filter(edge => edge.target === params.target).length > 1
+
+        if (duplicateSource) {
+            removeEdge(params)
+            ElMessage.warning('该被检通道已经连接，不能重复连接')
+            return
+        }
+
+        if (duplicateTarget) {
+            removeEdge(params)
+            ElMessage.warning('该标准通道已经连接，不能重复连接')
+            return
+        }
     }
-  }
 }
 
 // 删除不合法连接
 const removeEdge = (params: any) => {
-  const edgeIndex = edges.value.findIndex(edge => 
-    edge.source === params.source && edge.target === params.target
-  )
-  if (edgeIndex !== -1) {
-    edges.value.splice(edgeIndex, 1)
-  }
+    const edgeIndex = edges.value.findIndex(edge => edge.source === params.source && edge.target === params.target)
+    if (edgeIndex !== -1) {
+        edges.value.splice(edgeIndex, 1)
+    }
 }
 
-
 const nodes = ref([])
 const planId = ref('')
 const devIds = ref<string[]>()
 const standardDevIds = ref<string[]>()
 
-const open = async (device: Device.ResPqDev[], standardDev: StandardDevice.ResPqStandardDevice[],fatherPlanId: string) => {
-  console.log('device:', device);
-  edges.value = []
-  devIds.value = device.map(d => d.id)
-  standardDevIds.value = standardDev.map(d => d.id)
-  planId.value = fatherPlanId
-  nodes.value = createNodes(device, standardDev)
-  dialogVisible.value = true
-  onPaneReady()
+const open = async (
+    device: Device.ResPqDev[],
+    standardDev: StandardDevice.ResPqStandardDevice[],
+    fatherPlanId: string
+) => {
+    console.log('device:', device)
+    edges.value = []
+    devIds.value = device.map(d => d.id)
+    standardDevIds.value = standardDev.map(d => d.id)
+    planId.value = fatherPlanId
+    nodes.value = createNodes(device, standardDev)
+    dialogVisible.value = true
+    onPaneReady()
 }
 
-const handleNext = () => {
-  if (edges.value.length === 0) {
-    ElMessage.warning('请先完成通道配对')
-    return
-  }
-  dialogVisible.value = false
-  selectTestItemPopupRef.value?.open()
+const handleNext = async () => {
+    if (edges.value.length === 0) {
+        ElMessage.warning('请先完成通道配对')
+        return
+    }
+    // const sourceKey = edge.source.replace('被检通道-', '').replace('-', '_');
+    let chnNumList: object[] = []
+    await edges.value.forEach(edge => {
+        const match = edge.source.split('-')
+
+        if (match) {
+            chnNumList.push({
+                deviceId: match[1],
+                label: match[2]
+            })
+        }
+    })
+    console.log('🚀 ~ handleNext ~ edges.value:', edges.value)
+
+    await checkStore.setChnNum(chnNumList)
+    dialogVisible.value = false
+    selectTestItemPopupRef.value?.open()
 }
 
 const openTestDialog = async () => {
-  // 转换连接信息，只保留设备ID和通道号
-  const connections = edges.value.reduce((map, edge) => {
-    // 从source中提取设备ID和通道号: 被检通道-{deviceId}-{channelNum} => {deviceId}-{channelNum}
-    const sourceKey = edge.source.replace('被检通道-', '').replace('-', '_');
+    // 转换连接信息，只保留设备ID和通道号
+    const connections = edges.value.reduce(
+        (map, edge) => {
+            // 从source中提取设备ID和通道号: 被检通道-{deviceId}-{channelNum} => {deviceId}-{channelNum}
+            const sourceKey = edge.source.replace('被检通道-', '').replace('-', '_')
 
-    // 从target中提取设备ID和通道号: 标准通道-{deviceId}-{channelNum} => {deviceId}-{channelNum}
-    const targetValue = edge.target.replace('标准通道-', '').replace('-', '_');
-    
-    map[sourceKey] = targetValue;
-    return map;
-  }, {} as Record<string, string>);
+            // 从target中提取设备ID和通道号: 标准通道-{deviceId}-{channelNum} => {deviceId}-{channelNum}
+            const targetValue = edge.target.replace('标准通道-', '').replace('-', '_')
 
+            map[sourceKey] = targetValue
+            return map
+        },
+        {} as Record<string, string>
+    )
 
-  generateChannelMapping()
+    generateChannelMapping()
 
-  testPopup.value?.open(dialogTitle.value,channelMapping.value,planId.value,jwtUtil.getLoginName(),devIds.value,standardDevIds.value,connections)
+    testPopup.value?.open(
+        dialogTitle.value,
+        channelMapping.value,
+        planId.value,
+        jwtUtil.getLoginName(),
+        devIds.value,
+        standardDevIds.value,
+        connections
+    )
 }
 
 // 转换 edges.value 为 channelMapping 格式
@@ -237,197 +266,197 @@ const channelMapping = ref<Record<string, Record<string, string>>>({})
 
 // 生成映射关系的方法
 const generateChannelMapping = () => {
-  const mapping: Record<string, Record<string, string>> = {}
+    const mapping: Record<string, Record<string, string>> = {}
 
-  edges.value.forEach(edge => {
-    // 解析 source 节点信息（被检通道）
-    const sourceParts = edge.source.split('-')
-    const sourceDeviceId = sourceParts[1]
-    const sourceChannel = sourceParts[2]
+    edges.value.forEach(edge => {
+        // 解析 source 节点信息（被检通道）
+        const sourceParts = edge.source.split('-')
+        const sourceDeviceId = sourceParts[1]
+        const sourceChannel = sourceParts[2]
 
-    // 解析 target 节点信息（标准通道）
-    const targetParts = edge.target.split('-')
-    const targetDeviceId = targetParts[1]
-    const targetChannel = targetParts[2]
+        // 解析 target 节点信息（标准通道）
+        const targetParts = edge.target.split('-')
+        const targetDeviceId = targetParts[1]
+        const targetChannel = targetParts[2]
 
-    // 查找对应的节点以获取显示名称
-    const sourceDeviceNode = nodes.value.find(node => node.id === sourceDeviceId)
-    const targetDeviceNode = nodes.value.find(node => node.id === targetDeviceId)
+        // 查找对应的节点以获取显示名称
+        const sourceDeviceNode = nodes.value.find(node => node.id === sourceDeviceId)
+        const targetDeviceNode = nodes.value.find(node => node.id === targetDeviceId)
 
-    if (sourceDeviceNode && targetDeviceNode) {
-      // 提取设备显示文本
-      const sourceDeviceText = sourceDeviceNode.data.label.children[1].children
-      const targetDeviceText = targetDeviceNode.data.label.children[1].children
+        if (sourceDeviceNode && targetDeviceNode) {
+            // 提取设备显示文本
+            const sourceDeviceText = sourceDeviceNode.data.label.children[1].children
+            const targetDeviceText = targetDeviceNode.data.label.children[1].children
 
-     // 构造键名 - 现在以标准设备为键
-      const targetKey = `${targetDeviceText}`.replace('设备名称：', '')
-      const sourceValue = `${sourceDeviceText}通道${sourceChannel}`.replace('设备名称：', '')
+            // 构造键名 - 现在以标准设备为键
+            const targetKey = `${targetDeviceText}`.replace('设备名称：', '')
+            const sourceValue = `${sourceDeviceText}通道${sourceChannel}`.replace('设备名称：', '')
 
-      // 初始化对象
-      if (!mapping[targetKey]) {
-        mapping[targetKey] = {}
-      }
+            // 初始化对象
+            if (!mapping[targetKey]) {
+                mapping[targetKey] = {}
+            }
 
-      // 添加映射关系 - 标准设备通道 -> 被检设备信息
-      mapping[targetKey][`通道${targetChannel}`] = sourceValue
-    }
-  })
+            // 添加映射关系 - 标准设备通道 -> 被检设备信息
+            mapping[targetKey][`通道${targetChannel}`] = sourceValue
+        }
+    })
 
-  channelMapping.value = mapping
+    channelMapping.value = mapping
 }
 
 const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResPqStandardDevice[]) => {
-  const channelCounts: Record<string, number> = {}
-  device.forEach(device => {
-    channelCounts[device.id] = device.devChns || 0
-  })
+    const channelCounts: Record<string, number> = {}
+    device.forEach(device => {
+        channelCounts[device.id] = device.devChns || 0
+    })
 
-  const inspectionDevices = device.map(d => ({
-    id: d.id,
-    name: d.name,
-    type: 'normal',
-    deviceType: d.devType
-  }))
+    const inspectionDevices = device.map(d => ({
+        id: d.id,
+        name: d.name,
+        type: 'normal',
+        deviceType: d.devType
+    }))
 
-  const channelCounts2: Record<string, number> = {}
-  standardDev.forEach(dev => {
-    const channelList = dev.inspectChannel ? dev.inspectChannel.split(',') : []
-    channelCounts2[dev.id] = channelList.length
-  })
+    const channelCounts2: Record<string, number> = {}
+    standardDev.forEach(dev => {
+        const channelList = dev.inspectChannel ? dev.inspectChannel.split(',') : []
+        channelCounts2[dev.id] = channelList.length
+    })
 
-  const standardDevices = standardDev.map(d => ({
-    id: d.id,
-    name: d.name,
-    type: 'normal',
-    deviceType: d.devType
-  }))
+    const standardDevices = standardDev.map(d => ({
+        id: d.id,
+        name: d.name,
+        type: 'normal',
+        deviceType: d.devType
+    }))
 
-  const newNodes: any[] = []
-  const deviceChannelGroups: { deviceId: string; centerY: number; }[] = []
-  const standardChannelGroups: any[] = []
- 
-  const deviceWidth = 0
-  const inputChannelX = 200
-  const outputChannelX = 800
-  const standardWidth = 950
+    const newNodes: any[] = []
+    const deviceChannelGroups: { deviceId: string; centerY: number }[] = []
+    const standardChannelGroups: any[] = []
 
-  const yPosition = ref(25)
-  const yPosition2 = ref(25)
+    const deviceWidth = 0
+    const inputChannelX = 200
+    const outputChannelX = 800
+    const standardWidth = 950
 
-  // 添加被检通道
-  Object.entries(channelCounts).forEach(([deviceId, count]) => {
-    for (let i = 1; i <= count; i++) {
-      const channelId = `被检通道-${deviceId}-${i}`
-      newNodes.push({  
-        id: channelId,
-        type: 'input',
-        data: { label: createLabel3(`被检通道${i}`) },
-        position: { x: inputChannelX, y: yPosition.value },
-        sourcePosition: 'right',
-        style: { width: '150px', border: 'none', boxShadow: 'none' }
-      })
-      
-      // 计算设备节点Y坐标（居中显示）
-      if(i == 1 && count == 1){
-         deviceChannelGroups.push({
-          deviceId,
-          centerY: yPosition.value - 25
-        })
-      }else if(i == 2 && count == 2){
-         deviceChannelGroups.push({
-          deviceId,
-          centerY: yPosition.value - 50
-        })
-      }else if(i == 3 && count == 3){
-        deviceChannelGroups.push({
-          deviceId,
-          centerY: yPosition.value - 75
-        })
-      }else if(i == 4 && count == 4){
-        deviceChannelGroups.push({
-          deviceId,
-          centerY: yPosition.value - 100
-        })
-      }
-      
-      yPosition.value += 50 
-    }
-    yPosition.value += 50
-  })
+    const yPosition = ref(25)
+    const yPosition2 = ref(25)
 
-  // 添加标准通道
-  Object.entries(channelCounts2).forEach(([deviceId, count]) => {
-    for (let i = 1; i <= count; i++) {
-      const channelId = `标准通道-${deviceId}-${i}`
-      newNodes.push({  
-        id: channelId,
-        type: 'output',
-        data: { label: createLabel3(`标准通道${i}`) },
-        position: { x: outputChannelX, y: yPosition2.value },
-        targetPosition: 'left',
-        style: { width: '150px', border: 'none', boxShadow: 'none' }
-      })
-      
-      // 计算设备节点Y坐标（居中显示）
-      if(i == 1 && count == 1){
-         standardChannelGroups.push({
-          deviceId,
-          centerY: yPosition2.value - 25
-        })
-      }else if(i == 2 && count == 2){
-         standardChannelGroups.push({
-          deviceId,
-          centerY: yPosition2.value - 50
-        })
-      }else if(i == 3 && count == 3){
-        standardChannelGroups.push({
-          deviceId,
-          centerY: yPosition2.value - 100
-        })
-      }else if(i == 4 && count == 4){
-        standardChannelGroups.push({
-          deviceId,
-          centerY: yPosition2.value - 100
-        })
-      }
-      
-      yPosition2.value += 50
-    }
-    yPosition2.value += 50
-  })
+    // 添加被检通道
+    Object.entries(channelCounts).forEach(([deviceId, count]) => {
+        for (let i = 1; i <= count; i++) {
+            const channelId = `被检通道-${deviceId}-${i}`
+            newNodes.push({
+                id: channelId,
+                type: 'input',
+                data: { label: createLabel3(`被检通道${i}`) },
+                position: { x: inputChannelX, y: yPosition.value },
+                sourcePosition: 'right',
+                style: { width: '150px', border: 'none', boxShadow: 'none' }
+            })
 
-  // 添加被检设备
-  deviceChannelGroups.forEach(({ deviceId, centerY }) => {
-    const device = inspectionDevices.find(d => d.id === deviceId)
-    if (device) {
-      newNodes.push({
-        id: device.id,
-        data: { label: createLabel(device.name, device.deviceType) },
-        position: { x: deviceWidth, y: centerY },
-        class: 'no-handle-node',
-        style: { width: '200px', border: 'none', boxShadow: 'none' }
-      })
-    }
-  })
+            // 计算设备节点Y坐标（居中显示）
+            if (i == 1 && count == 1) {
+                deviceChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition.value - 25
+                })
+            } else if (i == 2 && count == 2) {
+                deviceChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition.value - 50
+                })
+            } else if (i == 3 && count == 3) {
+                deviceChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition.value - 75
+                })
+            } else if (i == 4 && count == 4) {
+                deviceChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition.value - 100
+                })
+            }
 
-  // 添加标准设备
-  standardChannelGroups.forEach(({ deviceId, centerY }) => {
-    const device = standardDevices.find(d => d.id === deviceId)
-    if (device) {
-      newNodes.push({
-        id: device.id,
-        data: { label: createLabel(device.name, device.deviceType) },
-        position: { x: standardWidth, y: centerY },
-        class: 'no-handle-node',
-        style: { width: '200px', border: 'none', boxShadow: 'none' }
-      })
-    }
-  })
+            yPosition.value += 50
+        }
+        yPosition.value += 50
+    })
 
-  //页面高度取决于设备通道
-  dialogHeight.value = Math.max(yPosition.value, yPosition2.value)
+    // 添加标准通道
+    Object.entries(channelCounts2).forEach(([deviceId, count]) => {
+        for (let i = 1; i <= count; i++) {
+            const channelId = `标准通道-${deviceId}-${i}`
+            newNodes.push({
+                id: channelId,
+                type: 'output',
+                data: { label: createLabel3(`标准通道${i}`) },
+                position: { x: outputChannelX, y: yPosition2.value },
+                targetPosition: 'left',
+                style: { width: '150px', border: 'none', boxShadow: 'none' }
+            })
 
-  return newNodes
+            // 计算设备节点Y坐标（居中显示）
+            if (i == 1 && count == 1) {
+                standardChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition2.value - 25
+                })
+            } else if (i == 2 && count == 2) {
+                standardChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition2.value - 50
+                })
+            } else if (i == 3 && count == 3) {
+                standardChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition2.value - 100
+                })
+            } else if (i == 4 && count == 4) {
+                standardChannelGroups.push({
+                    deviceId,
+                    centerY: yPosition2.value - 100
+                })
+            }
+
+            yPosition2.value += 50
+        }
+        yPosition2.value += 50
+    })
+
+    // 添加被检设备
+    deviceChannelGroups.forEach(({ deviceId, centerY }) => {
+        const device = inspectionDevices.find(d => d.id === deviceId)
+        if (device) {
+            newNodes.push({
+                id: device.id,
+                data: { label: createLabel(device.name, device.deviceType) },
+                position: { x: deviceWidth, y: centerY },
+                class: 'no-handle-node',
+                style: { width: '200px', border: 'none', boxShadow: 'none' }
+            })
+        }
+    })
+
+    // 添加标准设备
+    standardChannelGroups.forEach(({ deviceId, centerY }) => {
+        const device = standardDevices.find(d => d.id === deviceId)
+        if (device) {
+            newNodes.push({
+                id: device.id,
+                data: { label: createLabel(device.name, device.deviceType) },
+                position: { x: standardWidth, y: centerY },
+                class: 'no-handle-node',
+                style: { width: '200px', border: 'none', boxShadow: 'none' }
+            })
+        }
+    })
+
+    //页面高度取决于设备通道
+    dialogHeight.value = Math.max(yPosition.value, yPosition2.value)
+
+    return newNodes
 }
 
 defineExpose({ open })
@@ -435,11 +464,11 @@ defineExpose({ open })
 
 <style>
 .flow-container {
-  width: 100%;
-  overflow: hidden;
+    width: 100%;
+    overflow: hidden;
 }
 
 .vue-flow__node.no-handle-node .vue-flow__handle {
-  display: none !important;
+    display: none !important;
 }
-</style>
\ No newline at end of file
+</style>