diff --git a/frontend/src/api/check/test/index.ts b/frontend/src/api/check/test/index.ts
index 942471d..97c0335 100644
--- a/frontend/src/api/check/test/index.ts
+++ b/frontend/src/api/check/test/index.ts
@@ -13,7 +13,8 @@ export const getBigTestItem = (params: {
 export const getScriptList = (params: {
     devId:string,
     chnNum:number,
-    num:number
+    num:number,
+    planId:string
 }) => {
     return http.post('/result/getCheckItem', params, {loading: false})
 }
diff --git a/frontend/src/views/home/components/channelPairing.vue b/frontend/src/views/home/components/channelPairing.vue
index 1f1394f..059a339 100644
--- a/frontend/src/views/home/components/channelPairing.vue
+++ b/frontend/src/views/home/components/channelPairing.vue
@@ -206,7 +206,9 @@ const handleConnect = (params: any) => {
 
 // 删除不合法连接
 const removeEdge = (params: any) => {
+    console.log('删除不合法连接:', params);
     const edgeIndex = edges.value.findIndex(edge => edge.source === params.source && edge.target === params.target)
+    console.log('删除连接信息:', edges.value);
     if (edgeIndex !== -1) {
         edges.value.splice(edgeIndex, 1)
     }
@@ -350,21 +352,21 @@ const generateChannelMapping = () => {
 
 
 // 计算基于 dialogWidth 的位置参数 - 确保最小距离
-const deviceWidthVal = computed(() => {
+ const standardWidthVal = computed(() => {
   return Math.max(0, 50)
-})
-
-const inputChannelXVal = computed(() => {
-  return Math.max(300, deviceWidthVal.value + 300)
-})
-
-const outputChannelXVal = computed(() => {
-  return Math.max(650, prop.dialogWidth - 470)
-})
-
-const standardWidthVal = computed(() => {
+ })
+ 
+ const inputChannelXVal = computed(() => {
+  return Math.max(300, standardWidthVal.value + 300)
+ })
+ 
+ const outputChannelXVal = computed(() => {
+  return Math.max(600, prop.dialogWidth - 500)
+ })
+ 
+ const deviceWidthVal = computed(() => {
   return Math.max(800, prop.dialogWidth - 350)
-})
+ })
 
 const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResPqStandardDevice[], deviceMonitor: Map<string, any[]>) => {
     const channelCounts: Record<string, number> = {}
@@ -404,10 +406,10 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
     // const inputChannelX = 350
     // const outputChannelX = 1050
     // const standardWidth = 1170
-    const deviceWidth = deviceWidthVal.value
-    const inputChannelX = inputChannelXVal.value
-    const outputChannelX = outputChannelXVal.value
-    const standardWidth = standardWidthVal.value
+   const standardWidth = standardWidthVal.value
+   const outputChannelX = inputChannelXVal.value
+   const inputChannelX = outputChannelXVal.value
+   const deviceWidth = deviceWidthVal.value
 
     // 添加被检通道
     // let currentYPosition = 50; // 初始Y位置
@@ -463,7 +465,7 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
                 type: 'input',
                 data: { label: createLabel3(`被检通道${channelNum}`+ statusText) },
                 position: { x: inputChannelX, y: yPosition + index * 50 },
-                sourcePosition: 'right',
+                sourcePosition: 'left',
                 style: { width: '160px', border: 'none', boxShadow: 'none' }
             });
 
@@ -499,7 +501,7 @@ const createNodes = (device: Device.ResPqDev[], standardDev: StandardDevice.ResP
                 type: 'output',
                 data: { label: createLabel3(`标准通道${i}`) },
                 position: { x: outputChannelX, y: yPosition2 + (i - 1) * 50 },
-                targetPosition: 'left',
+                targetPosition: 'right',
                 style: { width: '120px', border: 'none', boxShadow: 'none' }
             });
 
diff --git a/frontend/src/views/home/components/compareDataCheckRawDataTable.vue b/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
index 8693046..6a88ca7 100644
--- a/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
@@ -11,13 +11,7 @@
     >
       <el-table-column type="index" label="序号" width="70" fixed="left"/>
 
-      <el-table-column prop="dataA" :label="'被检设备'">
-        <el-table-column prop="timeDev" label="数据时间" width="200"/>
-        <el-table-column prop="uaDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null"/>
-        <el-table-column prop="ubDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null"/>
-        <el-table-column prop="ucDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucDev != null"/>
-        <el-table-column prop="utDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utDev != null"/>
-      </el-table-column>
+      
       <el-table-column prop="dataA" :label="'标准设备'">
         <el-table-column prop="timeStdDev" label="数据时间" width="200"/>
         <el-table-column prop="uaStdDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaStdDev != null"/>
@@ -25,6 +19,13 @@
         <el-table-column prop="ucStdDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucStdDev != null"/>
         <el-table-column prop="utStdDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utStdDev != null"/>
       </el-table-column>
+      <el-table-column prop="dataA" :label="'被检设备'">
+        <el-table-column prop="timeDev" label="数据时间" width="200"/>
+        <el-table-column prop="uaDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null"/>
+        <el-table-column prop="ubDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null"/>
+        <el-table-column prop="ucDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucDev != null"/>
+        <el-table-column prop="utDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utDev != null"/>
+      </el-table-column>
     </el-table>
   </div>
 </template>
diff --git a/frontend/src/views/home/components/compareDataCheckResultTable.vue b/frontend/src/views/home/components/compareDataCheckResultTable.vue
index 9e3b22e..a085689 100644
--- a/frontend/src/views/home/components/compareDataCheckResultTable.vue
+++ b/frontend/src/views/home/components/compareDataCheckResultTable.vue
@@ -8,16 +8,17 @@
     >
 <!--      <el-table-column type="index" label="序号" width="70" fixed="left" />-->
       <el-table-column label="A相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataA">
-        <el-table-column prop="stdA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
-          <template #default="{ row }">
-            {{ row.dataA.data }}
-          </template>
-        </el-table-column>
+        
         <el-table-column prop="dataA" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataA.resultData }}
           </template>
         </el-table-column>
+        <el-table-column prop="stdA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataA.data }}
+          </template>
+        </el-table-column>
         <el-table-column prop="isDataA" label="检测结果">
           <template #default="{ row }">
             <el-tooltip effect="dark" placement="bottom">
@@ -35,16 +36,17 @@
         </el-table-column>
       </el-table-column>
       <el-table-column :label="setB" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataB">
-        <el-table-column prop="stdB" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
-          <template #default="{ row }">
-            {{ row.dataB.data }}
-          </template>
-        </el-table-column>
+        
         <el-table-column prop="dataB" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataB.resultData }}
           </template>
         </el-table-column>
+        <el-table-column prop="stdB" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataB.data }}
+          </template>
+        </el-table-column>
         <el-table-column prop="isDataB" label="检测结果">
           <template #default="{ row }">
             <el-tooltip effect="dark" placement="bottom">
@@ -62,16 +64,17 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="C相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataC">
-        <el-table-column prop="stdC" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
-          <template #default="{ row }">
-            {{ row.dataC.data }}
-          </template>
-        </el-table-column>
+        
         <el-table-column prop="dataC" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataC.resultData }}
           </template>
         </el-table-column>
+        <el-table-column prop="stdC" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataC.data }}
+          </template>
+        </el-table-column>
         <el-table-column prop="isDataC" label="检测结果">
           <template #default="{ row }">
             <el-tooltip effect="dark" placement="bottom">
@@ -89,15 +92,16 @@
         </el-table-column>
       </el-table-column>
       <el-table-column :label="setT" v-if="prop.tableData[0].dataT">
-        <el-table-column prop="stdT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
-          <template #default="{ row }">
-            {{ row.dataT.data }}
-          </template>
-        </el-table-column>
+       
         <el-table-column prop="dataT" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">
           <template #default="{ row }">
             {{ row.dataT.resultData }}
           </template>
+        </el-table-column>
+         <el-table-column prop="stdT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')">
+          <template #default="{ row }">
+            {{ row.dataT.data }}
+          </template>
         </el-table-column>
         <el-table-column prop="isDataT" label="检测结果">
           <template #default="{ row }">
diff --git a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
index 31f005d..6243b11 100644
--- a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
@@ -322,7 +322,8 @@ const initScriptData = async () => {
     let response: any = await getScriptList({
         devId: formContent.deviceId,
         chnNum: formContent.chnNum,
-        num: formContent.num
+        num: formContent.num,
+        planId: checkStore.plan.id
     })
 
     // 格式化脚本数据
@@ -521,7 +522,6 @@ const getResults = async (code: any) => {
         }
         currentCheckItem.value = list[0]
         tesList.value = list
-        console.log('checkResultData:', tesList.value)
         checkResultData.value = res.data.resultMap
         rawTableData.value = res.data.rawDataMap
     })
diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue
index 2f0604f..a3c0dfa 100644
--- a/frontend/src/views/home/components/compareTestPopup.vue
+++ b/frontend/src/views/home/components/compareTestPopup.vue
@@ -479,7 +479,7 @@ watch(ActiveStatue, function (newValue, oldValue) {
         nextStep() // 实现自动点击，进入下一个测试内容
         //handleSubmitFast()
     }
-  
+    console.log('stepsActiveIndex.value', stepsActiveIndex.value)   
 })
 
 const handleQuit = () => {
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index a1eb836..2920073 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -517,6 +517,7 @@ const close = () => {
 
 //子组件监测点变化通知父组件设备台账
 const getParameter = (data: Monitor.ResPqMon[]) => {
+    console.log('子组件监测点变化通知父组件设备台账', data)
     monitor.value = data
     //保存监测点信息自动更新设备台账的被检通道
     formContent.inspectChannel = monitor.value
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index cd554d3..65e6db1 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -383,7 +383,7 @@
 
 <script lang="ts" setup>
 import { type CascaderOption, ElMessage, type FormItemRule } from 'element-plus'
-import { computed, reactive, ref } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
 import { dialogBig } from '@/utils/elementBind'
 import { type Plan } from '@/api/plan/interface'
 import {
@@ -761,7 +761,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             user_Result: any
 
         if (mode.value === '比对式') {
-            ;[
+            [
                 PqErrSys_Result,
                 pqDevList_Result,
                 pqReportName_Result,
@@ -800,8 +800,14 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
                         .map((user: any) => ({ ...user, disabled: false }))
                 }
             }
+
+            // 默认选择 cp95值 作为数据处理原则
+            const dataRuleDict = dictStore.getDictData('Data_Rule')
+            const rule = dataRuleDict.find(item => item.code === 'Cp95_Value')
+            formContent.dataRule = rule ? rule.id : ''
+
         } else {
-            ;[pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] =
+            [pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] =
                 await Promise.all([
                     getTestSourceList(data),
                     getPqScriptList(data),