From 0c9b8fe24e495da1f5e3362fa6b36acc41617cb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 29 六月 2023 11:35:19 +0800
Subject: [PATCH] 优化寻车，出库问题
---
src/main/webapp/views/lift.html | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/lift.html b/src/main/webapp/views/lift.html
index 32a14ba..b8f5ea6 100644
--- a/src/main/webapp/views/lift.html
+++ b/src/main/webapp/views/lift.html
@@ -65,6 +65,7 @@
<th>杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�</th>
<th>鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�</th>
<th>浣滀笟鏍囪</th>
+ <th>绌挎杞﹀彿</th>
</tr>
</thead>
<tbody>
@@ -95,11 +96,20 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="liftOperator(1)">涓婂崌涓�灞�</button>
- <button class="item" onclick="liftOperator(2)">涓嬮檷涓�灞�</button>
- <button class="item" onclick="liftOperator(3)">鏈夎揣姝ｈ浆</button>
- <button class="item" onclick="liftOperator(4)">鏈夎揣鍙嶈浆</button>
- <button class="item" onclick="liftOperator(5)">澶嶄綅</button>
+ <select id="liftLev">
+ <option value="1" selected>1F</option>
+ <option value="3">2F</option>
+ <option value="4">3F</option>
+ <option value="5">4F</option>
+ <option value="2">杈撻�佺嚎浣嶇疆</option>
+ </select>
+ <button class="item" onclick="liftOperator(1)">绉诲姩鎻愬崌鏈�</button>
+ <button class="item" onclick="liftOperator(3)">鏃犺揣姝ｈ浆</button>
+ <button class="item" onclick="liftOperator(4)">鏃犺揣鍙嶈浆</button>
+ <button class="item" onclick="liftOperator(5)">鏈夎揣姝ｈ浆</button>
+ <button class="item" onclick="liftOperator(6)">鏈夎揣鍙嶈浆</button>
+ <button class="item" onclick="liftOperator(7)">閾炬潯鍋滄</button>
+ <button class="item" onclick="liftOperator(0)">澶嶄綅</button>
</div>
</fieldset>
</div>
@@ -309,7 +319,7 @@
let tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].liftNo);
setVal(tr.children("td").eq(1), table[i-1].taskNo);
- setVal(tr.children("td").eq(2), table[i-1].protocolStatus);
+ setVal(tr.children("td").eq(2), table[i-1].protocolStatus$);
setVal(tr.children("td").eq(3), table[i-1].liftLock$);
setVal(tr.children("td").eq(4), table[i-1].positionArrivalFeedback);
setVal(tr.children("td").eq(5), table[i-1].ready$);
@@ -322,8 +332,8 @@
setVal(tr.children("td").eq(12), table[i-1].servoError1);
setVal(tr.children("td").eq(13), table[i-1].servoError2);
setVal(tr.children("td").eq(14), table[i-1].servoError3);
- setVal(tr.children("td").eq(14), table[i-1].servoError4);
- setVal(tr.children("td").eq(14), table[i-1].liftActualSpeed);
+ setVal(tr.children("td").eq(15), table[i-1].servoError4);
+ setVal(tr.children("td").eq(16), table[i-1].liftActualSpeed);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -360,6 +370,7 @@
setVal(tr.children("td").eq(7), table[i-1].inConveyLineCardTrayAlarm$);
setVal(tr.children("td").eq(8), table[i-1].outConveyLineCardTrayAlarm$);
setVal(tr.children("td").eq(9), table[i-1].pakMk);
+ setVal(tr.children("td").eq(10), table[i-1].shuttleNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -393,6 +404,7 @@
http.post(baseUrl+"/lift/operator/lift", {
liftNo: $('input[name="liftSelect"]:checked').val(),
liftTaskMode: liftTaskMode,
+ lev: $("#liftLev").val()
}, function (res) {
layer.msg(res.msg, {icon: 1});
});
--
Gitblit v1.9.1