From 0e0cf6f88516ca1aad92a0f2df7129a95dc4d1fc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 四月 2023 13:48:45 +0800
Subject: [PATCH] 四向穿梭车界面+错误码
---
src/main/webapp/views/shuttle.html | 154 ++++++++++++++++++++++++---------------------------
1 files changed, 72 insertions(+), 82 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index f1eafbb..ce3a332 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -20,7 +20,7 @@
<div style="padding: 10px;height: 100%">
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
- <div class="command-log" id="commandLogId">
+ <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>-->
@@ -28,24 +28,28 @@
<!-- </div>-->
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="shuttle-state">
+ <div class="shuttle-state" style="width: 95%;">
<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>鎺�</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>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>
</tr>
</thead>
<tbody>
@@ -61,11 +65,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>
@@ -95,49 +100,17 @@
<!-- 璁惧浠诲姟鎿嶄綔 -->
<div class="task-operator">
<div style="display: flex;">
- <div class="task-operator" style="height: auto;width: auto;">
+ <div class="task-operator" style="height: auto;width: 100%;">
<div class="operator-item" style="height: auto">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
+ <span class="select-title">婧愬簱浣�/鐩爣搴撲綅</span>
<div class="select-container" style="height: auto">
<div class="select-container-item">
- <span>绔�</span>
- <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
+ <span>婧愬簱浣�</span>
+ <label><input id="sourceLocNo" type="text" name="sourceLocNo" /></label>
</div>
<div class="select-container-item">
- <span>鎺�</span>
- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- </div>
- </div>
- </div>
-
- <div class="task-operator" style="height: auto;width: auto;">
- <div class="operator-item" style="height: auto">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
- <div class="select-container" style="height: auto">
- <div class="select-container-item">
- <span>绔�</span>
- <label><input id="distStaNo" type="number" name="points" min="0" /></label>
- </div>
- <div class="select-container-item">
- <span>鎺�</span>
- <label><input id="distRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
- <label><input id="distBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
- </div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="distLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
+ <span>鐩爣搴撲綅</span>
+ <label><input id="distLocNo" type="text" name="distLocNo" /></label>
</div>
</div>
</div>
@@ -147,14 +120,21 @@
<fieldset style="height: auto;padding-bottom: 20px;">
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="shuttleOperator(4)">鎵樼洏椤跺崌</button>
- <button class="item" onclick="shuttleOperator(4)">鎵樼洏鏀句笅</button>
+ <button class="item" onclick="shuttleOperator(1)">鍏ュ簱</button>
+ <button class="item" onclick="shuttleOperator(2)">鍑哄簱</button>
+ <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(16)">浠诲姟瀹屾垚</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>
@@ -584,8 +564,8 @@
//娓叉煋鍥涘悜绌挎杞︽暟鎹淮鎶ゅ拰璁惧淇℃伅html
let shuttleCommandLogBox = '<div class="shuttle-command-item" data-shuttleNo="' + table[i - 1].shuttleNo + '">\n' +
'<label>' + table[i - 1].shuttleNo + '#</label>\n' +
- '<button class="demoBtn pos-btn">鏁版嵁缁存姢</button>\n' +
- '<button class="demoBtn mode-btn" id="mode-' + table[i - 1].shuttleNo + '">璁惧淇℃伅</button>\n' +
+ // '<button class="demoBtn pos-btn">鏁版嵁缁存姢</button>\n' +
+ // '<button class="demoBtn mode-btn" id="mode-' + table[i - 1].shuttleNo + '">璁惧淇℃伅</button>\n' +
'</div>'
$("#commandLogId").append(shuttleCommandLogBox);
}
@@ -617,18 +597,22 @@
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].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);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -658,12 +642,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";
@@ -696,7 +681,9 @@
function shuttleOperator(shuttleTaskMode) {
http.post(baseUrl+"/shuttle/operator/shuttle", {
shuttleNo: $('input[name="shuttleSelect"]:checked').val(),
- shuttleTaskMode: shuttleTaskMode
+ shuttleTaskMode: shuttleTaskMode,
+ sourceLocNo: $("#sourceLocNo").val(),
+ distLocNo: $("#distLocNo").val()
}, function (res) {
layer.msg(res.msg, {icon: 1});
});
@@ -736,6 +723,9 @@
" <td></td>\n" +
" <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