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 | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index f5455f1..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>
@@ -46,6 +46,7 @@
<th>鏁呴殰鐮�</th>
<th>绠″埗鐘舵��</th>
<th>浣庣數閲�</th>
+ <th>婕旂ず妯″紡</th>
</tr>
</thead>
<tbody>
@@ -62,10 +63,7 @@
<th>宸ヤ綔鍙�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
- <th>鏈�楂樼數鑺數鍘�</th>
- <th>鏈�浣庣數鑺數鍘�</th>
<th>鐢垫睜鐢靛帇</th>
- <th>鍏呮斁鐢靛惊鐜鏁�</th>
<th>鍓╀綑鐢甸噺</th>
<th>鎬荤數閲�</th>
<th>浣滀笟鏍囪</th>
@@ -131,6 +129,8 @@
<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>
@@ -165,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">
@@ -263,7 +257,6 @@
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
- token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -344,6 +337,7 @@
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";
@@ -382,17 +376,10 @@
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), maxCellVoltage);
- setVal(tr.children("td").eq(5), minCellVoltage);
- setVal(tr.children("td").eq(6), voltage);
- setVal(tr.children("td").eq(7), chargeCycleTimes);
- setVal(tr.children("td").eq(8), surplusQuantity);
- setVal(tr.children("td").eq(9), countQuantity);
- setVal(tr.children("td").eq(10), table[i-1].pakMk$);
- 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