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 | 94 +++++++++++++++++++++--------------------------
1 files changed, 42 insertions(+), 52 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index fda3c72..e038a00 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -20,21 +20,22 @@
<div style="padding: 10px;height: 100%">
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
- <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>-->
-<!-- <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>-->
-<!-- </div>-->
- </div>
+<!-- <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>–>-->
+<!--<!– <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>–>-->
+<!--<!– </div>–>-->
+<!-- </div>-->
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="shuttle-state" style="width: 95%;">
+ <div class="shuttle-state" style="width: 100%;">
<table id="shuttle-state-table">
<thead>
<tr>
<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>
@@ -71,6 +73,7 @@
<th>鎬婚噷绋嬫暟</th>
<th>浣滀笟鏍囪</th>
<th>褰撳墠搴撲綅</th>
+ <th>浠ょ墝</th>
</tr>
</thead>
<tbody>
@@ -88,9 +91,9 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 閫夋嫨 -->
- <div id="shuttle-select" class="operator-item">
+ <div id="shuttle-select" class="operator-item" style="width: 100%;">
<span class="select-title">鍥涘悜绌挎杞﹀彿</span>
- <div class="select-container" id="shuttleRadioBoxId">
+ <div class="select-container" id="shuttleRadioBoxId" style="display: flex;flex-wrap: wrap;justify-content: center;align-items: center;">
<!-- <label><input type="radio" name="shuttleSelect" value="1" checked> 1鍙风┛姊溅</label>-->
</div>
</div>
@@ -117,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>
@@ -132,40 +136,13 @@
<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>
</div>
</div>
</div>
</div>
-<!-- <div style="width: 20%;">-->
-<!-- <div class="operator-item" style="height: auto;width: 100%;">-->
-<!-- <span class="select-title">璁剧疆閰嶇疆鍙傛暟</span>-->
-<!-- <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
-<!-- <div class="select-container-item">-->
-<!-- <span>杩愯閫熷害</span>-->
-<!-- <label><input id="runSpeed" type="text" name="runSpeed" /></label>-->
-<!-- </div>-->
-<!-- <div class="select-container-item">-->
-<!-- <span>鍏呯數闃堝��</span>-->
-<!-- <label><input id="chargeLine" type="text" name="runSpeed" /></label>-->
-<!-- </div>-->
-
-<!-- <div>-->
-<!-- <button class="item" onclick="shuttleParamSave()">淇濆瓨</button>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <div style="width: 15%;">-->
-<!-- <div class="operator-item" style="height: auto;width: 100%;">-->
-<!-- <span class="select-title">閰嶇疆鍙傛暟</span>-->
-<!-- <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
-<!-- <div>杩愯閫熷害锛�<span id="runSpeedText"></span></div>-->
-<!-- <div>鍏呯數闃堝�硷細<span id="chargeLineText"></span></div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</fieldset>
</div>
@@ -196,6 +173,12 @@
<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">
@@ -260,6 +243,7 @@
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
+ token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -321,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";
@@ -368,9 +354,10 @@
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);
if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
$("#runSpeedText").text(table[i-1].runSpeed)
$("#chargeLineText").text(table[i-1].chargeLine + "%")
@@ -549,6 +536,7 @@
$('#shuttleNo').val(shuttleNo);
$('#workNo').val(table[i-1].taskNo);
$('#pakMk').val(table[i-1].pakMk$);
+ $('#token').val(table[i-1].token);
}
}
} else if (res.code === 403){
@@ -563,6 +551,7 @@
$('#shuttleNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
}
})
}
@@ -572,6 +561,7 @@
$('#shuttleNo').val("");
$('#workNo').val("");
$('#pakMk').val("");
+ $('#token').val("");
layer.close(layerDetl);
})
--
Gitblit v1.9.1