From 0b83448133a1af459273318bc5b0c2a4bc6e0448 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 08 四月 2023 17:09:14 +0800
Subject: [PATCH] 四向穿梭车逻辑优化
---
src/main/webapp/views/shuttle.html | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index 22252e4..fdfe262 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -39,7 +39,9 @@
<th>鐢甸噺</th>
<th>鐢垫睜娓╁害</th>
<th>閿欒缂栧彿</th>
- <th>plc杈撳嚭鐘舵�両O</th>
+ <th>plc杈撳嚭鐘舵�両O-鍏呯數浣�</th>
+ <th>閿欒淇℃伅鐮�</th>
+ <th>plc杈撳叆鐘舵��</th>
<th>褰撳墠鎴栦箣鍓嶄簩缁寸爜</th>
<th>x鍋忕Щ閲�</th>
<th>y鍋忕Щ閲�</th>
@@ -121,9 +123,15 @@
<button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
<button class="item" onclick="shuttleOperator(5)">宸︾Щ</button>
<button class="item" onclick="shuttleOperator(6)">鍙崇Щ</button>
- <button class="item" onclick="shuttleOperator(7)">鍓嶇Щ</button>
- <button class="item" onclick="shuttleOperator(8)">鍚庣Щ</button>
+ <button class="item" onclick="shuttleOperator(7)">鍚庣Щ</button>
+ <button class="item" onclick="shuttleOperator(8)">鍓嶇Щ</button>
<button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
+ <button class="item" onclick="shuttleOperator(10)">姝ｆ柟鍚�(宸�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(11)">璐熸柟鍚�(鍙�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(12)">姝ｆ柟鍚�(鍓�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(13)">璐熸柟鍚�(鍚�)瀵诲簱浣�</button>
+ <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
+ <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
</div>
</fieldset>
</div>
@@ -590,13 +598,15 @@
setVal(tr.children("td").eq(3), table[i-1].currentCode);
setVal(tr.children("td").eq(4), table[i-1].batteryPower);
setVal(tr.children("td").eq(5), table[i-1].batteryTemp);
- setVal(tr.children("td").eq(6), table[i-1].statusErrorCode$);
- setVal(tr.children("td").eq(7), table[i-1].plcOutputStatusIO);
- setVal(tr.children("td").eq(8), table[i-1].currentOrBeforeCode);
- setVal(tr.children("td").eq(9), table[i-1].codeOffsetX);
- setVal(tr.children("td").eq(10), table[i-1].codeOffsetY);
- setVal(tr.children("td").eq(11), table[i-1].currentVoltage);
- setVal(tr.children("td").eq(12), table[i-1].currentAnalogValue);
+ setVal(tr.children("td").eq(6), table[i-1].errorCode);
+ setVal(tr.children("td").eq(7), table[i-1].plcOutputCharge$);//plcOutputStatusIO
+ setVal(tr.children("td").eq(8), table[i-1].statusErrorCode);
+ setVal(tr.children("td").eq(9), table[i-1].plcInputStatus);
+ setVal(tr.children("td").eq(10), table[i-1].currentOrBeforeCode);
+ setVal(tr.children("td").eq(11), table[i-1].codeOffsetX);
+ setVal(tr.children("td").eq(12), table[i-1].codeOffsetY);
+ setVal(tr.children("td").eq(13), table[i-1].currentVoltage);
+ setVal(tr.children("td").eq(14), table[i-1].currentAnalogValue);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -707,6 +717,8 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#shuttle-state-table tbody').after(html);
--
Gitblit v1.9.1