From 09cb60c8bcbb4f7371e8b692da9af00c5d4fc538 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 15:22:55 +0800
Subject: [PATCH] 小车行走路径锁定方案，走一步锁两步，走完即解锁
---
src/main/webapp/views/shuttle.html | 165 ++++++++++++++++++++-----------------------------------
1 files changed, 60 insertions(+), 105 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index 3d3f32a..0651ec9 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -20,36 +20,32 @@
<div style="padding: 10px;height: 100%">
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
- <div class="command-log" id="commandLogId" style="width: 5%;">
-<!-- <div data-shuttleNo="1" class="shuttle-command-item">-->
-<!-- <label>1#</label>-->
-<!-- <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>-->
-<!-- <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>-->
-<!-- </div>-->
- </div>
+<!-- <div class="command-log" id="commandLogId" style="width: 5%;">-->
+<!--<!– <div data-shuttleNo="1" class="shuttle-command-item">–>-->
+<!--<!– <label>1#</label>–>-->
+<!--<!– <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>–>-->
+<!--<!– <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>–>-->
+<!--<!– </div>–>-->
+<!-- </div>-->
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="shuttle-state" style="width: 95%;">
+ <div class="shuttle-state" style="width: 100%;">
<table id="shuttle-state-table">
<thead>
<tr>
<th>鍥涘悜绌挎杞�</th>
<th>浠诲姟鐘舵��</th>
<th>灏忚溅鐘舵��</th>
- <th>褰撳墠浜岀淮鐮�</th>
+ <th>瀹為檯搴撲綅</th>
+ <th>瀹為檯鍧愭爣</th>
<th>鐢甸噺</th>
- <th>鐢垫睜娓╁害</th>
- <th>閿欒缂栧彿</th>
- <th>plc杈撳嚭鐘舵�両O-椤跺崌浣�</th>
- <th>plc杈撳嚭鐘舵�両O-鎹㈠悜浣�</th>
- <th>plc杈撳嚭鐘舵�両O-鎶遍椄浣�</th>
- <th>plc杈撳嚭鐘舵�両O-鍏呯數浣�</th>
- <th>閿欒淇℃伅鐮�</th>
- <th>plc杈撳叆鐘舵��</th>
- <th>褰撳墠鎴栦箣鍓嶄簩缁寸爜</th>
- <th>x鍋忕Щ閲�</th>
- <th>y鍋忕Щ閲�</th>
- <th>鐢靛帇</th>
- <th>妯℃嫙閲�</th>
+ <th>褰撳墠閫熷害</th>
+ <th>璐熻浇鐘舵��</th>
+ <th>椤跺崌浣嶇疆</th>
+ <th>杩愯鏂瑰悜</th>
+ <th>杩愯鏂瑰悜2</th>
+ <th>鍏呯數鐘舵��</th>
+ <th>鏁呴殰鐘舵��</th>
+ <th>鏁呴殰鐮�</th>
</tr>
</thead>
<tbody>
@@ -64,16 +60,17 @@
<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>鍏呮斁鐢靛惊鐜鏁�</th>
+ <th>鍓╀綑鐢甸噺</th>
+ <th>鎬荤數閲�</th>
+ <th>鎬婚噷绋嬫暟</th>
<th>浣滀笟鏍囪</th>
- <th>搴撲綅鍙�</th>
- <th>褰撳墠妤煎眰</th>
+ <th>褰撳墠搴撲綅</th>
</tr>
</thead>
<tbody>
@@ -91,9 +88,9 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 閫夋嫨 -->
- <div id="shuttle-select" class="operator-item">
+ <div id="shuttle-select" class="operator-item" style="width: 100%;">
<span class="select-title">鍥涘悜绌挎杞﹀彿</span>
- <div class="select-container" id="shuttleRadioBoxId">
+ <div class="select-container" id="shuttleRadioBoxId" style="display: flex;flex-wrap: wrap;justify-content: center;align-items: center;">
<!-- <label><input type="radio" name="shuttleSelect" value="1" checked> 1鍙风┛姊溅</label>-->
</div>
</div>
@@ -118,8 +115,7 @@
</div>
<div style="margin-top: 10px;">
- <button class="item" onclick="shuttleOperator(1)">鍏ュ簱</button>
- <button class="item" onclick="shuttleOperator(2)">鍑哄簱</button>
+ <button class="item" onclick="shuttleOperator(18)">鎼繍璐х墿</button>
<button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
<button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>
</div>
@@ -134,50 +130,13 @@
<div class="button-group">
<button class="item" onclick="shuttleOperator(3)">鎵樼洏椤跺崌</button>
<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(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(15)">鍏呯數寮�鍏�</button>
+ <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
</div>
</div>
</div>
</div>
- <div style="width: 20%;">
- <div class="operator-item" style="height: auto;width: 100%;">
- <span class="select-title">璁剧疆閰嶇疆鍙傛暟</span>
- <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
- <div class="select-container-item">
- <span>杩愯閫熷害</span>
- <label><input id="runSpeed" type="text" name="runSpeed" /></label>
- </div>
- <div class="select-container-item">
- <span>鍏呯數闃堝��</span>
- <label><input id="chargeLine" type="text" name="runSpeed" /></label>
- </div>
-
- <div>
- <button class="item" onclick="shuttleParamSave()">淇濆瓨</button>
- </div>
- </div>
- </div>
- </div>
-
- <div style="width: 15%;">
- <div class="operator-item" style="height: auto;width: 100%;">
- <span class="select-title">閰嶇疆鍙傛暟</span>
- <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
- <div>杩愯閫熷害锛�<span id="runSpeedText"></span></div>
- <div>鍏呯數闃堝�硷細<span id="chargeLineText"></span></div>
- </div>
- </div>
- </div>
</div>
</fieldset>
</div>
@@ -274,7 +233,7 @@
pakMk: $('#pakMk').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
- layer.close(layerIdx);
+ layer.close(layerDetl);
})
})
@@ -331,23 +290,19 @@
// $("#mode-"+table[i-1].shuttleNo).html(table[i-1].statusVal===0?'鑱旀満':'鑴辨満');
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].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].plcOutputLift$);//椤跺崌浣�
- setVal(tr.children("td").eq(8), table[i-1].plcOutputTransfer$);//鎹㈠悜浣�
- setVal(tr.children("td").eq(9), table[i-1].plcOutputBrake$);//鎶遍椄浣�
- setVal(tr.children("td").eq(10), table[i-1].plcOutputCharge$);//鍏呯數浣�
- setVal(tr.children("td").eq(11), table[i-1].statusErrorCode);
- setVal(tr.children("td").eq(12), table[i-1].plcInputStatus);
- setVal(tr.children("td").eq(13), table[i-1].currentOrBeforeCode);
- setVal(tr.children("td").eq(14), table[i-1].codeOffsetX);
- setVal(tr.children("td").eq(15), table[i-1].codeOffsetY);
- setVal(tr.children("td").eq(16), table[i-1].currentVoltage$);
- setVal(tr.children("td").eq(17), table[i-1].currentAnalogValue);
+ setVal(tr.children("td").eq(1), table[i-1].protocolStatus$);
+ setVal(tr.children("td").eq(2), table[i-1].free$);
+ setVal(tr.children("td").eq(3), table[i-1].point$);
+ setVal(tr.children("td").eq(4), table[i-1].coord$);
+ setVal(tr.children("td").eq(5), table[i-1].powerPercent$);
+ setVal(tr.children("td").eq(6), table[i-1].speed);
+ setVal(tr.children("td").eq(7), table[i-1].loadState$);
+ setVal(tr.children("td").eq(8), table[i-1].liftPosition$);
+ setVal(tr.children("td").eq(9), table[i-1].runDir$);
+ setVal(tr.children("td").eq(10), table[i-1].runDir2$);
+ setVal(tr.children("td").eq(11), table[i-1].chargState$);
+ setVal(tr.children("td").eq(12), table[i-1].errState$);
+ setVal(tr.children("td").eq(13), table[i-1].errCode);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -362,7 +317,7 @@
function getShuttleMsgInfo() {
let tableEl = $('#shuttle-msg-table');
$.ajax({
- url: baseUrl+ "/shuttle/table/shuttle/msg",
+ url: baseUrl+ "/shuttle/table/shuttle/state",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -375,18 +330,18 @@
for (var i=1;i<=table.length;i++){
var 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].workNo);
- setVal(tr.children("td").eq(2), table[i-1].status);
- 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);
- setVal(tr.children("td").eq(10), table[i-1].locNo);
- setVal(tr.children("td").eq(11), table[i-1].lev);
-
+ setVal(tr.children("td").eq(1), table[i-1].taskNo);
+ setVal(tr.children("td").eq(2), table[i-1].sourceLocNo);
+ setVal(tr.children("td").eq(3), table[i-1].locNo);
+ setVal(tr.children("td").eq(4), table[i-1].maxCellVoltage$);
+ setVal(tr.children("td").eq(5), table[i-1].minCellVoltage$);
+ setVal(tr.children("td").eq(6), table[i-1].voltage$);
+ setVal(tr.children("td").eq(7), table[i-1].chargeCycleTimes);
+ setVal(tr.children("td").eq(8), table[i-1].surplusQuantity);
+ setVal(tr.children("td").eq(9), table[i-1].countQuantity);
+ setVal(tr.children("td").eq(10), table[i-1].statusSum.mileage);
+ setVal(tr.children("td").eq(11), table[i-1].pakMk$);
+ setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
$("#runSpeedText").text(table[i-1].runSpeed)
$("#chargeLineText").text(table[i-1].chargeLine + "%")
@@ -554,7 +509,7 @@
content: $("#shuttle-detl"),
success: function(layero, index){
$.ajax({
- url: baseUrl+ "/shuttle/table/shuttle/msg",
+ url: baseUrl+ "/shuttle/table/shuttle/state",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -563,8 +518,8 @@
for (var i=1;i<=table.length;i++){
if (shuttleNo == table[i-1].shuttleNo) {
$('#shuttleNo').val(shuttleNo);
- $('#workNo').val(table[i-1].workNo);
- $('#pakMk').val(table[i-1].pakMk);
+ $('#workNo').val(table[i-1].taskNo);
+ $('#pakMk').val(table[i-1].pakMk$);
}
}
} else if (res.code === 403){
--
Gitblit v1.9.1