From e7ee6502ce70f0aa1728b9a67780ec28f6218a45 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 20 九月 2022 14:45:04 +0800 Subject: [PATCH] # --- src/main/webapp/views/pipeline.html | 9 ++++----- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 93566d9..28e6958 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -179,8 +179,8 @@ // 鍏呯數淇″彿浣� Thread.sleep(100); OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1); - if (result2.IsSuccess) { - boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1); + if (result3.IsSuccess) { + boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1); charge0 = status[0]; charge1 = status[1]; charge2 = status[2]; @@ -269,7 +269,7 @@ * @param open true 寮�濮嬪厖鐢碉紱false 缁撴潫鍏呯數 */ public boolean charge(int index, boolean open) { - OperateResult write = siemensS7Net.Write("DB102.50." + index + 3, open); + OperateResult write = siemensS7Net.Write("DB102.50." + (index + 3), open); if (!write.IsSuccess) { log.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗澶辫触", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴"); return false; diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html index 8ab209f..6415b2f 100644 --- a/src/main/webapp/views/pipeline.html +++ b/src/main/webapp/views/pipeline.html @@ -73,13 +73,12 @@ </div> </fieldset> </div> - - <div> - <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span> - </div> </div> <!-- 涓讳綋 --> <div class="plc-log-body"> + <div> + <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span> + </div> <table id="plc-error-table"> <thead> <tr> @@ -227,7 +226,7 @@ method: 'POST', success: function (res) { if (res.code === 200){ - layer.msg(res.msg, {icon: 1}) + layer.msg("鎿嶄綔鎴愬姛锛岃鑰愬績绛夊緟涓�鍒嗛挓", {icon: 1}) } else if (res.code === 403){ window.location.href = baseUrl+"/login"; } else { -- Gitblit v1.9.1