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 | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index 1fde92d..fdfe262 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -33,19 +33,20 @@
<thead>
<tr>
<th>鍥涘悜绌挎杞�</th>
- <th>寰呭畾</th>
- <th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍦ㄨ建</th>
+ <th>浠诲姟鐘舵��</th>
+ <th>灏忚溅鐘舵��</th>
+ <th>褰撳墠浜岀淮鐮�</th>
<th>鐢甸噺</th>
- <th>鎺�</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>绛夊緟WCS纭</th>
- <th>瀹氫綅</th>
- <th>鍏呯數鐘舵��</th>
- <th>鎶ヨ淇℃伅1</th>
- <th>鎶ヨ淇℃伅2</th>
+ <th>鐢垫睜娓╁害</th>
+ <th>閿欒缂栧彿</th>
+ <th>plc杈撳嚭鐘舵�両O-鍏呯數浣�</th>
+ <th>閿欒淇℃伅鐮�</th>
+ <th>plc杈撳叆鐘舵��</th>
+ <th>褰撳墠鎴栦箣鍓嶄簩缁寸爜</th>
+ <th>x鍋忕Щ閲�</th>
+ <th>y鍋忕Щ閲�</th>
+ <th>鐢靛帇</th>
+ <th>妯℃嫙閲�</th>
</tr>
</thead>
<tbody>
@@ -61,11 +62,12 @@
<th>鍥涘悜绌挎杞�</th>
<th>宸ヤ綔鍙�</th>
<th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
- <th>閫熷害</th>
+ <th>鍗囬檷浼烘湇閫熷害</th>
+ <th>琛岃蛋浼烘湇閫熷害</th>
+ <th>鍗囬檷浼烘湇璐熻浇</th>
+ <th>琛岃蛋浼烘湇璐熻浇</th>
<th>浣滀笟鏍囪</th>
</tr>
</thead>
@@ -121,8 +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>
@@ -585,18 +594,19 @@
let tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
setVal(tr.children("td").eq(1), table[i-1].status);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].loading);
- setVal(tr.children("td").eq(4), table[i-1].track);
- setVal(tr.children("td").eq(5), table[i-1].batteryPower);
- setVal(tr.children("td").eq(6), table[i-1].row);
- setVal(tr.children("td").eq(7), table[i-1].bay);
- setVal(tr.children("td").eq(8), table[i-1].lev);
- setVal(tr.children("td").eq(9), table[i-1].waiting);
- setVal(tr.children("td").eq(10), table[i-1].loca);
- setVal(tr.children("td").eq(11), table[i-1].chargeStatus);
- setVal(tr.children("td").eq(12), table[i-1].alarm1);
- setVal(tr.children("td").eq(13), table[i-1].alarm2);
+ setVal(tr.children("td").eq(2), table[i-1].busyStatus);
+ 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].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";
@@ -626,12 +636,13 @@
setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
- setVal(tr.children("td").eq(4), table[i-1].staNo);
- setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
- setVal(tr.children("td").eq(6), table[i-1].locNo);
- setVal(tr.children("td").eq(7), table[i-1].speed);
- setVal(tr.children("td").eq(8), table[i-1].pakMk);
+ setVal(tr.children("td").eq(3), table[i-1].sourceLocNo);
+ setVal(tr.children("td").eq(4), table[i-1].distLocNo);
+ setVal(tr.children("td").eq(5), table[i-1].currentLiftServoSpeed);
+ setVal(tr.children("td").eq(6), table[i-1].currentMoveServoSpeed);
+ setVal(tr.children("td").eq(7), table[i-1].currentLiftServoLoad);
+ setVal(tr.children("td").eq(8), table[i-1].currentMoveServoLoad);
+ setVal(tr.children("td").eq(9), table[i-1].pakMk);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -706,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