From 5bf2b51ec743cd422a0eb3277b9c93a08c700315 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 二月 2025 08:46:30 +0800
Subject: [PATCH] #
---
src/main/webapp/views/shuttle.html | 101 +++++++++++++++++++++++---------------------------
1 files changed, 47 insertions(+), 54 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index d11d3c5..09f102e 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>鍥涘悜绌挎杞︾洃鎺х鐞�</title>
<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
- <link rel="stylesheet" type="text/css" href="../static/css/common.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/common_wcs.css">
<link rel="stylesheet" type="text/css" href="../static/layui/css/layui.css">
<link rel="stylesheet" href="../static/css/shuttle.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -42,13 +42,11 @@
<th>褰撳墠閫熷害</th>
<th>璐熻浇鐘舵��</th>
<th>椤跺崌浣嶇疆</th>
- <th>杩愯鏂瑰悜</th>
- <th>杩愯鏂瑰悜2</th>
<th>鍏呯數鐘舵��</th>
- <th>鏁呴殰鐘舵��</th>
<th>鏁呴殰鐮�</th>
<th>绠″埗鐘舵��</th>
<th>浣庣數閲�</th>
+ <th>婕旂ず妯″紡</th>
</tr>
</thead>
<tbody>
@@ -65,16 +63,10 @@
<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>
<tbody>
@@ -119,9 +111,9 @@
</div>
<div style="margin-top: 10px;">
- <button class="item" onclick="shuttleOperator(18)">鎼繍璐х墿</button>
- <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
- <button class="item" onclick="shuttleOperator(23)">绉诲姩鍒扮洰鏍囧簱浣�(浠诲姟)</button>
+ <button class="item" onclick="shuttleOperator(9)">鎼繍璐х墿</button>
+ <button class="item" onclick="shuttleOperator(4)">绉诲姩鍒扮洰鏍囧簱浣�</button>
+ <button class="item" onclick="shuttleOperator(5)">绉诲姩鍒扮洰鏍囧簱浣�(浠诲姟)</button>
<!-- <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>-->
</div>
</div>
@@ -133,12 +125,12 @@
<span class="select-title">鐩稿叧鎸囦护</span>
<div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
<div class="button-group">
- <button class="item" onclick="shuttleOperator(3)">鎵樼洏椤跺崌</button>
- <button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
- <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
- <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
- <button class="item" onclick="shuttleOperator(21)">绠″埗</button>
- <button class="item" onclick="shuttleOperator(22)">鍙栨秷绠″埗</button>
+ <button class="item" onclick="shuttleOperator(1)">鎵樼洏椤跺崌</button>
+ <button class="item" onclick="shuttleOperator(2)">鎵樼洏涓嬮檷</button>
+ <button class="item" onclick="shuttleOperator(6)">鍏呯數寮�鍏�</button>
+ <button class="item" onclick="shuttleOperator(3)">澶嶄綅</button>
+ <button class="item" onclick="shuttleOperator(12)">婕旂ず妯″紡-寮�</button>
+ <button class="item" onclick="shuttleOperator(13)">婕旂ず妯″紡-鍏�</button>
</div>
</div>
</div>
@@ -173,12 +165,6 @@
<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">
@@ -271,7 +257,6 @@
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
- token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -333,23 +318,26 @@
for (let i=1;i<=table.length;i++){
// $("#mode-"+table[i-1].shuttleNo).html(table[i-1].statusVal===0?'鑱旀満':'鑴辨満');
let tr = tableEl.find("tr").eq(i);
+ let suspendState;
+ if (table[i - 1]['extend'] != undefined) {
+ suspendState = table[i-1]['extend'].suspendState
+ }
+
setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
setVal(tr.children("td").eq(1), table[i-1].protocolStatus$);
- setVal(tr.children("td").eq(2), table[i-1].free$);
- setVal(tr.children("td").eq(3), table[i-1].workingMode$);
- setVal(tr.children("td").eq(4), table[i-1].point$);
- setVal(tr.children("td").eq(5), table[i-1].point$$);
- setVal(tr.children("td").eq(6), table[i-1].powerPercent$);
+ setVal(tr.children("td").eq(2), table[i-1].deviceStatus$);
+ setVal(tr.children("td").eq(3), table[i-1].mode$);
+ setVal(tr.children("td").eq(4), table[i-1].currentLocNo);
+ setVal(tr.children("td").eq(5), table[i-1].currentCode);
+ setVal(tr.children("td").eq(6), table[i-1].batteryPower);
setVal(tr.children("td").eq(7), table[i-1].speed);
- setVal(tr.children("td").eq(8), table[i-1].loadState$);
- setVal(tr.children("td").eq(9), table[i-1].liftPosition$);
- setVal(tr.children("td").eq(10), table[i-1].runDir$);
- setVal(tr.children("td").eq(11), table[i-1].runDir2$);
- setVal(tr.children("td").eq(12), table[i-1].chargState$);
- setVal(tr.children("td").eq(13), table[i-1].errState$);
- setVal(tr.children("td").eq(14), table[i-1].errCode$);
- setVal(tr.children("td").eq(15), table[i-1].suspendState$);
- setVal(tr.children("td").eq(16), table[i-1].lowerPower);
+ setVal(tr.children("td").eq(8), table[i-1].hasPallet$);
+ setVal(tr.children("td").eq(9), table[i-1].hasLift$);
+ setVal(tr.children("td").eq(10), table[i-1].hasCharge$);
+ setVal(tr.children("td").eq(11), table[i-1].statusErrorCode$);
+ setVal(tr.children("td").eq(12), suspendState);
+ setVal(tr.children("td").eq(13), table[i-1].lowerPower);
+ setVal(tr.children("td").eq(14), table[i-1].demo$);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -369,24 +357,29 @@
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
+ let maxCellVoltage;
+ let minCellVoltage;
+ let voltage;
+ let chargeCycleTimes;
+ let surplusQuantity;
+ let countQuantity;
+ if (table[i - 1]['extend'] != undefined) {
+ maxCellVoltage = table[i-1]['extend'].maxCellVoltage
+ minCellVoltage = table[i-1]['extend'].minCellVoltage
+ voltage = table[i-1]['extend'].voltage
+ chargeCycleTimes = table[i-1]['extend'].chargeCycleTimes
+ surplusQuantity = table[i-1]['extend'].surplusQuantity
+ countQuantity = table[i-1]['extend'].countQuantity
+ }
+
setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
setVal(tr.children("td").eq(1), table[i-1].taskNo);
setVal(tr.children("td").eq(2), table[i-1].sourceLocNo);
setVal(tr.children("td").eq(3), table[i-1].locNo);
- setVal(tr.children("td").eq(4), table[i-1].maxCellVoltage$);
- setVal(tr.children("td").eq(5), table[i-1].minCellVoltage$);
- setVal(tr.children("td").eq(6), table[i-1].voltage$);
- setVal(tr.children("td").eq(7), table[i-1].chargeCycleTimes);
- setVal(tr.children("td").eq(8), table[i-1].surplusQuantity);
- setVal(tr.children("td").eq(9), table[i-1].countQuantity);
- setVal(tr.children("td").eq(10), table[i-1].statusSum ? 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 + "%")
- }
+ setVal(tr.children("td").eq(4), voltage);
+ setVal(tr.children("td").eq(5), surplusQuantity);
+ setVal(tr.children("td").eq(6), countQuantity);
+ setVal(tr.children("td").eq(7), table[i-1].pakMk$);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1