From 3c3ec87a6ac907d375f2fb78f0882ab9f30a1533 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 21 四月 2025 14:26:00 +0800
Subject: [PATCH] 999
---
src/main/webapp/views/lift.html | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/lift.html b/src/main/webapp/views/lift.html
index 0de4eab..1fdcf83 100644
--- a/src/main/webapp/views/lift.html
+++ b/src/main/webapp/views/lift.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/lift.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -40,6 +40,7 @@
<th>鍙宠秴闄�</th>
<th>瓒呴珮</th>
<th>瓒呴噸</th>
+ <th>寮傚父淇℃伅</th>
</tr>
</thead>
<tbody>
@@ -54,13 +55,10 @@
<tr>
<th>鎻愬崌鏈�</th>
<th>宸ヤ綔鍙�</th>
- <th>浠诲姟鍦板潃</th>
- <th>鐩殑鍦板潃</th>
<th>宸插畬鎴愮殑浠诲姟鍙�</th>
<th>灞�</th>
<th>浣滀笟鏍囪</th>
<th>绌挎杞﹀彿</th>
- <th>浠ょ墝</th>
</tr>
</thead>
<tbody>
@@ -93,13 +91,31 @@
<div class="button-group">
<select id="liftLev">
<option value="1" selected>1F</option>
- <option value="3">2F</option>
- <option value="4">3F</option>
- <option value="5">4F</option>
- <option value="2">杈撻�佺嚎浣嶇疆</option>
+ <option value="2">2F</option>
+ <option value="3">3F</option>
+ <option value="4">4F</option>
+ <option value="5">5F</option>
+ <option value="6">6F</option>
+ <option value="7">7F</option>
+ <option value="8">8F</option>
+ <option value="9">9F</option>
</select>
<button class="item" onclick="liftOperator(1)">绉诲姩鎻愬崌鏈�</button>
+
+ <div class="select-container-item">
+ <span>婧愮珯</span>
+ <label><input id="sourceStaNo" type="text" name="sourceStaNo" /></label>
+ </div>
+ <div class="select-container-item">
+ <span>鐩爣绔�</span>
+ <label><input id="staNo" type="text" name="staNo" /></label>
+ </div>
+ <button class="item" onclick="liftOperator(5)">鎵樼洏鍏�</button>
+ <button class="item" onclick="liftOperator(6)">鎵樼洏鍑�</button>
+ <button class="item" onclick="liftOperator(7)">绉诲姩</button>
+ <button class="item" onclick="liftOperator(8)">杞﹁揣绉诲姩</button>
<button class="item" onclick="liftOperator(0)">澶嶄綅</button>
+ <button class="item" onclick="liftOperator(3)">绛夊緟纭</button>
</div>
</fieldset>
</div>
@@ -128,12 +144,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">
@@ -200,7 +210,6 @@
liftNo: $('#liftNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
- token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -261,16 +270,17 @@
setVal(tr.children("td").eq(1), table[i-1].taskNo);
setVal(tr.children("td").eq(2), table[i-1].protocolStatus$);
setVal(tr.children("td").eq(3), table[i-1].model$);
- setVal(tr.children("td").eq(4), table[i-1].busy$);
+ setVal(tr.children("td").eq(4), table[i-1].run$);
setVal(tr.children("td").eq(5), table[i-1].hasTray$);
setVal(tr.children("td").eq(6), table[i-1].hasCar$);
- setVal(tr.children("td").eq(7), table[i-1].deviceError$);
+ setVal(tr.children("td").eq(7), table[i-1].errCode$);
setVal(tr.children("td").eq(8), table[i-1].frontOverrun$);
setVal(tr.children("td").eq(9), table[i-1].backOverrun$);
setVal(tr.children("td").eq(10), table[i-1].leftOverrun$);
setVal(tr.children("td").eq(11), table[i-1].rightOverrun$);
setVal(tr.children("td").eq(12), table[i-1].overHeight$);
setVal(tr.children("td").eq(13), table[i-1].overWeight$);
+ setVal(tr.children("td").eq(14), table[i-1].errCode$);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -299,13 +309,10 @@
var tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].liftNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].taskAddress);
- setVal(tr.children("td").eq(3), table[i-1].distAddress);
- setVal(tr.children("td").eq(4), table[i-1].completeTaskNo);
- setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].pakMk);
- setVal(tr.children("td").eq(7), table[i-1].shuttleNo);
- setVal(tr.children("td").eq(8), table[i-1].token);
+ setVal(tr.children("td").eq(2), table[i-1].completeTaskNo);
+ setVal(tr.children("td").eq(3), table[i-1].lev);
+ setVal(tr.children("td").eq(4), table[i-1].pakMk);
+ setVal(tr.children("td").eq(5), table[i-1].shuttleNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -339,7 +346,9 @@
http.post(baseUrl+"/lift/operator/lift", {
liftNo: $('input[name="liftSelect"]:checked').val(),
liftTaskMode: liftTaskMode,
- lev: $("#liftLev").val()
+ lev: $("#liftLev").val(),
+ sourceStaNo: $("#sourceStaNo").val(),
+ staNo: $("#staNo").val()
}, function (res) {
layer.msg(res.msg, {icon: 1});
});
--
Gitblit v1.9.1