From 95acbc65a8f55ac54a631a149f50192b085d5ad9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 12:49:12 +0800
Subject: [PATCH] 控制台四向穿梭车增加库位号和层高，提升机参数输出设置
---
src/main/webapp/views/shuttle.html | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index fdfe262..616bbb7 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,7 +28,7 @@
<!-- </div>-->
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="shuttle-state">
+ <div class="shuttle-state" style="width: 95%;">
<table id="shuttle-state-table">
<thead>
<tr>
@@ -39,6 +39,9 @@
<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>
@@ -69,6 +72,8 @@
<th>鍗囬檷浼烘湇璐熻浇</th>
<th>琛岃蛋浼烘湇璐熻浇</th>
<th>浣滀笟鏍囪</th>
+ <th>搴撲綅鍙�</th>
+ <th>褰撳墠妤煎眰</th>
</tr>
</thead>
<tbody>
@@ -561,8 +566,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);
}
@@ -599,14 +604,17 @@
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].plcOutputCharge$);//plcOutputStatusIO
- setVal(tr.children("td").eq(8), table[i-1].statusErrorCode);
- setVal(tr.children("td").eq(9), table[i-1].plcInputStatus);
- setVal(tr.children("td").eq(10), table[i-1].currentOrBeforeCode);
- setVal(tr.children("td").eq(11), table[i-1].codeOffsetX);
- setVal(tr.children("td").eq(12), table[i-1].codeOffsetY);
- setVal(tr.children("td").eq(13), table[i-1].currentVoltage);
- setVal(tr.children("td").eq(14), table[i-1].currentAnalogValue);
+ 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 ? table[i-1].currentVoltage + "V" : "");
+ setVal(tr.children("td").eq(17), table[i-1].currentAnalogValue);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -643,6 +651,8 @@
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);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -719,6 +729,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#shuttle-state-table tbody').after(html);
--
Gitblit v1.9.1