From 03e68b2be24ea024eae645c47da1d4cb1773302a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 19:47:13 +0800
Subject: [PATCH] #
---
src/main/webapp/views/shuttle.html | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index d553a77..e038a00 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -35,6 +35,7 @@
<th>鍥涘悜绌挎杞�</th>
<th>浠诲姟鐘舵��</th>
<th>灏忚溅鐘舵��</th>
+ <th>宸ヤ綔妯″紡</th>
<th>瀹為檯搴撲綅</th>
<th>瀹為檯鍧愭爣</th>
<th>鐢甸噺</th>
@@ -46,6 +47,7 @@
<th>鍏呯數鐘舵��</th>
<th>鏁呴殰鐘舵��</th>
<th>鏁呴殰鐮�</th>
+ <th>绠″埗鐘舵��</th>
</tr>
</thead>
<tbody>
@@ -118,7 +120,8 @@
<div style="margin-top: 10px;">
<button class="item" onclick="shuttleOperator(18)">鎼繍璐х墿</button>
<button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
- <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>
+ <button class="item" onclick="shuttleOperator(23)">绉诲姩鍒扮洰鏍囧簱浣�(浠诲姟)</button>
+<!-- <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>-->
</div>
</div>
</div>
@@ -302,17 +305,19 @@
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].point$);
- setVal(tr.children("td").eq(4), table[i-1].coord$);
- setVal(tr.children("td").eq(5), table[i-1].powerPercent$);
- setVal(tr.children("td").eq(6), table[i-1].speed);
- setVal(tr.children("td").eq(7), table[i-1].loadState$);
- setVal(tr.children("td").eq(8), table[i-1].liftPosition$);
- setVal(tr.children("td").eq(9), table[i-1].runDir$);
- setVal(tr.children("td").eq(10), table[i-1].runDir2$);
- setVal(tr.children("td").eq(11), table[i-1].chargState$);
- setVal(tr.children("td").eq(12), table[i-1].errState$);
- setVal(tr.children("td").eq(13), table[i-1].errCode);
+ 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(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$);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -349,7 +354,7 @@
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.mileage);
+ 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);
--
Gitblit v1.9.1