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 | 64 +++++++-------------------------
1 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index d5be706..0651ec9 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -20,15 +20,15 @@
<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>
@@ -70,6 +70,7 @@
<th>鎬荤數閲�</th>
<th>鎬婚噷绋嬫暟</th>
<th>浣滀笟鏍囪</th>
+ <th>褰撳墠搴撲綅</th>
</tr>
</thead>
<tbody>
@@ -87,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>
@@ -114,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>
@@ -130,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>
@@ -378,6 +341,7 @@
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 + "%")
--
Gitblit v1.9.1