From 5ee2cdb8d80f71d3e474adb6ae33e1281048cac3 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Sun, 11 Jan 2026 21:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96G30=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/l2/send/drive.vue | 64 +++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/views/l2/send/drive.vue b/src/views/l2/send/drive.vue
index bc043b9..d46bd95 100644
--- a/src/views/l2/send/drive.vue
+++ b/src/views/l2/send/drive.vue
@@ -127,7 +127,7 @@
                   :loading="setup.sendingNext"
                   class="header-btn"
                 >
-                  → Send Next Plan <!-- 下一计划下发 -->
+                  Send Next Plan <!-- 下一计划下发 -->
                 </el-button>
               </div>
             </div>
@@ -191,28 +191,48 @@ const DRIVE_FIELDS = [
   { key: 'towerTension', label: 'Cooling Tower Tension' } // 冷却塔张力
 ]
 
-// OPC地址映射（设定值地址，从 OpcMessageIdsManager.java 的 loadL2SetupIds() 方法获取）
-// 注意：L2Setup 中的地址是设定值地址，用于发送设定值到PLC
+// OPC地址映射（当前设定值地址，从实际OPC配置获取的真实地址）
 const DRIVE_ADDRESS = {
-  // 全线张力设定值
-  porTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionPorBR1',
-  celTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionBR3',
-  cleanTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionBR1BR2',
-  // 钝化段张力对应 BR7-BR8 段
-  passivationTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionBR7BR8',
-  cxlTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionBR8BR9',
-  trTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionBR9TR',
+  // 全线张力设定值（当前设定值）
+  porTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.1kjjtensionsetting', // 开卷机张力设定
+  celTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.rkhttensionsetting', // 入口活套张力设定
+  cleanTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.qxdtensionsetting', // 清洗段张力设定
+  passivationTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.dhlqdtensionsetting', // 钝化段张力设定
+  cxlTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.ckhttensionsetting', // 出口活套张力设定
+  trTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.sjjtensionsetting', // 卷取机张力设定
 
   // 平整机设定值
-  levelerEntryTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionBR5TM',
-  levelerExitTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionTMBR6',
+  levelerEntryTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.ljjtensionsetting', // 平整机张力设定（入口）
+  levelerExitTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.ljjtensionsetting', // 平整机张力设定（出口，与入口共用）
 
   // 矫直机设定值
-  straightenerExitTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionTLBR7',
+  straightenerExitTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.gzjcktensionsetting', // 矫直机出口张力设定
 
   // 退火炉设定值
-  furTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionFur1',
-  towerTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.tensionFur2'
+  furTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.thltensionsetting', // 退火炉张力设定
+  towerTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.thltensionsetting' // 冷却塔张力设定（与退火炉共用）
+}
+
+// OPC地址映射（下一设定值地址）
+const DRIVE_ADDRESS_NEXT = {
+  // 全线张力下一设定值
+  porTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.1kjjtensionsettingnext', // 开卷机张力下一设定值
+  celTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.rkhttensionsettingnext', // 入口活套张力下一设定值
+  cleanTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.qxdtensionsettingnext', // 清洗段张力下一设定值
+  passivationTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.dhlqdtensionsettingnext', // 钝化段张力下一设定值
+  cxlTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.ckhttensionsettingnext', // 出口活套张力下一设定值
+  trTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.sjjtensionsettingnext', // 卷取机张力下一设定值
+
+  // 平整机下一设定值
+  levelerEntryTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.ljjtensionsettingnext', // 平整机张力下一设定值（入口）
+  levelerExitTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.ljjtensionsettingnext', // 平整机张力下一设定值（出口，与入口共用）
+
+  // 矫直机下一设定值
+  straightenerExitTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.gzjcktensionsettingnext', // 矫直机出口张力下一设定值
+
+  // 退火炉下一设定值
+  furTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.thltensionsettingnext', // 退火炉张力下一设定值
+  towerTension: 'ns=2;s=ProcessCGL.PLCLine.L2Setup.thltensionsettingnext' // 冷却塔张力下一设定值（与退火炉共用）
 }
 
 export default {
@@ -225,7 +245,8 @@ export default {
       planQueueLoading: false,
       planQueue: [],
       driveFields: DRIVE_FIELDS,
-      driveAddress: { ...DRIVE_ADDRESS }
+      driveAddress: { ...DRIVE_ADDRESS },
+      driveAddressNext: { ...DRIVE_ADDRESS_NEXT }
     }
   },
   created() {
@@ -386,15 +407,18 @@ export default {
       }
 
       try {
+        // 根据是否是下一计划，选择对应的地址映射
+        const addressMap = isNextPlan ? this.driveAddressNext : this.driveAddress
+        
         const items = this.driveFields.map(f => ({
           paramCode: f.key,
-          address: this.driveAddress[f.key],
+          address: addressMap[f.key],
           valueRaw: String(setup.params[f.key] || ''),
           setTime: new Date()
-        })).filter(it => !!it.address)
+        })).filter(it => !!it.address && it.valueRaw !== '')
 
         if (!items.length) {
-          this.$message.warning('OPC address not configured, nothing to send') // OPC地址未配置，无可下发内容
+          this.$message.warning('OPC address not configured or no values to send') // OPC地址未配置或没有可发送的值
           return
         }