From 2b97e11ec9159f276fa054b080393e38ab69ba9a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 10 八月 2023 10:57:40 +0800
Subject: [PATCH] 检测路径是否可行走。如果路径为目标库位，但不可行走，系统将尝试重新计算路径
---
src/main/webapp/views/shuttle.html | 61 +++++++++++-------------------
1 files changed, 22 insertions(+), 39 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index fda3c72..f786948 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>
@@ -71,6 +71,7 @@
<th>鎬婚噷绋嬫暟</th>
<th>浣滀笟鏍囪</th>
<th>褰撳墠搴撲綅</th>
+ <th>浠ょ墝</th>
</tr>
</thead>
<tbody>
@@ -88,9 +89,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>
@@ -137,35 +138,6 @@
</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>
@@ -196,6 +168,12 @@
<label class="form-label">浣滀笟鏍囪:</label>
<div class="form-input">
<input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
+ <label class="form-label">浠ょ墝:</label>
+ <div class="form-input">
+ <input id="token" name="token" type="text" class="layui-input" autocomplete="off">
</div>
</div>
<div class="form-item form-button-container">
@@ -260,6 +238,7 @@
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
+ token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -371,6 +350,7 @@
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);
+ setVal(tr.children("td").eq(13), table[i-1].token);
if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
$("#runSpeedText").text(table[i-1].runSpeed)
$("#chargeLineText").text(table[i-1].chargeLine + "%")
@@ -549,6 +529,7 @@
$('#shuttleNo').val(shuttleNo);
$('#workNo').val(table[i-1].taskNo);
$('#pakMk').val(table[i-1].pakMk$);
+ $('#token').val(table[i-1].token);
}
}
} else if (res.code === 403){
@@ -563,6 +544,7 @@
$('#shuttleNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
}
})
}
@@ -572,6 +554,7 @@
$('#shuttleNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
layer.close(layerDetl);
})
--
Gitblit v1.9.1