From aeaf3e43e425ef0de84c1819f318f20e90471f90 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 02 十月 2025 11:49:37 +0800
Subject: [PATCH] #和得服务器
---
src/main/webapp/views/rgv.html | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index 902a27e..a36ad90 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -102,6 +102,7 @@
<!-- <th>鏈夌墿2</th>-->
<th>鏁呴殰浠ｇ爜</th>
<th>鏁呴殰鎻忚堪</th>
+ <th>閿佸畾鐘舵��</th>
</tr>
</thead>
<tbody>
@@ -115,12 +116,14 @@
<thead>
<tr>
<th>RGV</th>
- <th>宸ヤ綔鍙�</th>
+ <th>宸ヤ綅1宸ヤ綔鍙�</th>
+ <th>宸ヤ綅2宸ヤ綔鍙�</th>
<th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
+ <th>璧拌鐩爣绔�</th>
+ <th>宸ヤ綅1鐩爣绔�</th>
+ <th>宸ヤ綅2鐩爣绔�</th>
+ <!-- <th>婧愬簱浣�</th>-->
+<!-- <th>鐩爣搴撲綅</th>-->
<!-- <th>璧拌閫熷害锛坢/min)</th>-->
<!-- <th>鍗囬檷閫熷害锛坢/min)</th>-->
<!-- <th>鍙夌墮閫熷害锛坢/min)</th>-->
@@ -147,20 +150,21 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="rgv-select" class="operator-item" style="width: 55%">
+ <div id="rgv-select" class="operator-item" style="width: 30%">
<span class="select-title">RGV鍙�</span>
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="rgvSelect" value="1" checked> 1鍙稲GV</label>
<label><input type="radio" name="rgvSelect" value="2"> 2鍙稲GV</label>
+<!-- <label><input type="radio" name="rgvSelect" value="3"> 3鍙稲GV</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
- <div id="source-select" class="operator-item">
- <span class="select-title">婧愮珯</span>
+ <div id="source-select1" class="operator-item">
+ <span class="select-title">宸ヤ綅</span>
<div class="select-container">
<div class="select-container-item">
- <span>宸ヤ綅1婧愮珯</span>
- <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
+ <span>宸ヤ綅</span>
+ <label><input id="workSta" type="number" name="points" min="0" /></label>
</div>
<!-- <div class="select-container-item">-->
<!-- <span>鎺�</span>-->
@@ -177,11 +181,11 @@
</div>
</div>
<!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
- <div id="target-select" class="operator-item">
+ <div id="target-select2" class="operator-item">
<span class="select-title">鐩爣绔�</span>
<div class="select-container">
<div class="select-container-item">
- <span>宸ヤ綅1鐩爣绔�</span>
+ <span>鐩爣绔�</span>
<label><input id="staNo" type="number" name="points" min="0" /></label>
</div>
<!-- <div class="select-container-item">-->
@@ -198,6 +202,27 @@
<!-- </div>-->
</div>
</div>
+ <div id="target-select" class="operator-item">
+ <span class="select-title">宸ヤ綔鍙�</span>
+ <div class="select-container">
+ <div class="select-container-item">
+ <span>宸ヤ綔鍙�</span>
+ <label><input id="workNo" type="number" name="points" min="0" /></label>
+ </div>
+ <!-- <div class="select-container-item">-->
+ <!-- <span>鎺�</span>-->
+ <!-- <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
+ <!-- </div>-->
+ <!-- <div class="select-container-item">-->
+ <!-- <span>宸ヤ綅2鐩爣绔�</span>-->
+ <!-- <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>-->
+ <!-- </div>-->
+ <!-- <div class="select-container-item">-->
+ <!-- <span>灞�</span>-->
+ <!-- <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
+ <!-- </div>-->
+ </div>
+ </div>
</div>
<!-- 璁惧浠诲姟鎿嶄綔 -->
@@ -205,18 +230,19 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="put()">鍙栨斁璐�</button>
-<!-- <button class="item" onclick="take()">鍙栬揣</button>-->
-<!-- <button class="item" onclick="stockMove()">鏀捐揣</button>-->
+<!-- <button class="item" onclick="put()">鍙栨斁璐�</button>-->
+ <button class="item" onclick="take()">鍙栬揣</button>
+ <button class="item" onclick="stockMove()">鏀捐揣</button>
<!-- <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+<!-- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>-->
+<!-- <button class="item" onclick="lock()">瑙ｉ攣</button>-->
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
-<!-- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
- <button class="item" onclick="handleReset()">澶嶄綅</button>
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
+<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
</div>
</fieldset>
</div>
@@ -300,7 +326,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200){
var table = res.data;
if (table.length > rgvStateTableBlankRows && table.length !== rgvStateTableFullRows) {
@@ -322,6 +348,7 @@
// setVal(tr.children("td").eq(10), table[i-1].loading2);
setVal(tr.children("td").eq(8), table[i-1].warnCode);
setVal(tr.children("td").eq(9), table[i-1].alarm);
+ setVal(tr.children("td").eq(10), table[i-1].pakMk);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -349,12 +376,10 @@
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].rgvNo);
- setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
+ setVal(tr.children("td").eq(1), table[i-1].workNo1);
+ setVal(tr.children("td").eq(2), table[i-1].workNo2);
+ setVal(tr.children("td").eq(3), table[i-1].status);
setVal(tr.children("td").eq(4), table[i-1].staNo);
- setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
- setVal(tr.children("td").eq(6), table[i-1].locNo);
// setVal(tr.children("td").eq(7), table[i-1].xspeed);
// setVal(tr.children("td").eq(8), table[i-1].yspeed);
// setVal(tr.children("td").eq(9), table[i-1].zspeed);
@@ -380,6 +405,8 @@
var sourceRow = $('#sourceRow').val();
var sourceBay = $('#sourceBay').val();
var sourceLev = $('#sourceLev').val();
+ var workSta = $('#workSta').val();
+ var workNo = $('#workNo').val();
var staNo = $('#staNo').val();
var row = $('#row').val();
var bay = $('#bay').val();
@@ -391,6 +418,8 @@
sourceBay: sourceBay,
sourceLev: sourceLev,
staNo: staNo,
+ workSta: workSta,
+ workNo: workNo,
row: row,
bay: bay,
lev: lev
@@ -404,14 +433,14 @@
});
}
- // 鍑哄簱
+ // 鍙栬揣
function take() {
http.post(baseUrl+"/rgv/operator/take", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
- // 搴撲綅杞Щ
+ // 鏀捐揣
function stockMove() {
http.post(baseUrl+"/rgv/operator/stockMove", getReqParam(), function (res) {
layer.msg(res.msg);
@@ -453,6 +482,12 @@
});
}
+ function lock() {
+ http.post(baseUrl+"/rgv/lock", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
// 鏆傚仠
function pause() {
http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {
@@ -488,7 +523,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
rgvOutput(res.data);
} else if (res.code === 403) {
--
Gitblit v1.9.1