From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/rgv.html | 288 ++++++++++++++++++++++-----------------------------------
1 files changed, 113 insertions(+), 175 deletions(-)
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index 55039cf..fc468d9 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<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/crn.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/rgv.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
@@ -51,7 +51,7 @@
<!-- 鎵ц鍛戒护 -->
<!-- 鎵ц鍛戒护 -->
- <div class="command-log">
+ <!--<div class="command-log">-->
<!-- <h3>鎵ц涓殑鍛戒护</h3>-->
<!-- <div class="crn-command-item">-->
<!-- <label>1#</label>-->
@@ -83,9 +83,9 @@
<!-- <!– <span> </span>–>-->
<!-- <input id="crn5" disabled="disabled">-->
<!-- </div>-->
- </div>
+<!-- </div>-->
<!-- RGV鐘舵�佷綅淇℃伅 -->
- <div class="crn-state">
+ <div class="rgv-state">
<table id="rgv-state-table">
<thead>
<tr>
@@ -110,7 +110,7 @@
</div>
</div>
<!-- RGV鐘舵�� -->
- <div class="crn-msg">
+ <div class="rgv-msg">
<table id="rgv-msg-table">
<thead>
<tr>
@@ -135,11 +135,11 @@
</table>
</div>
<!-- 鎵嬪姩鎿嶄綔 -->
- <div class="crn-operation">
+ <div class="rgv-operation">
<!-- 閬僵灞� -->
- <div class="crn-operation-shade">
- <span class="crn-operation-shade-span">
+ <div class="rgv-operation-shade">
+ <span class="rgv-operation-shade-span">
WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
</span>
</div>
@@ -147,55 +147,55 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="crn-select" class="operator-item" style="width: 55%">
+ <div id="rgv-select" class="operator-item" style="width: 55%">
<span class="select-title">RGV鍙�</span>
<div class="select-container" style="padding: 20px 0;">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙稲GV</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙稲GV</label>
+ <label><input type="radio" name="rgvSelect" value="1" checked> 1鍙稲GV</label>
+ <label><input type="radio" name="rgvSelect" value="2"> 2鍙稲GV</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
<div id="source-select" class="operator-item">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
+ <span class="select-title">婧愮珯</span>
<div class="select-container">
<div class="select-container-item">
- <span>绔�</span>
+ <span>宸ヤ綅1婧愮珯</span>
<label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
</div>
+<!-- <div class="select-container-item">-->
+<!-- <span>鎺�</span>-->
+<!-- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
+<!-- </div>-->
<div class="select-container-item">
- <span>鎺�</span>
- <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
- <div class="select-container-item">
- <span>鍒�</span>
+ <span>宸ヤ綅2婧愮珯</span>
<label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
</div>
- <div class="select-container-item">
- <span>灞�</span>
- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
- </div>
+<!-- <div class="select-container-item">-->
+<!-- <span>灞�</span>-->
+<!-- <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>-->
+<!-- </div>-->
</div>
</div>
<!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
<div id="target-select" class="operator-item">
- <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
+ <span class="select-title">鐩爣绔�</span>
<div class="select-container">
<div class="select-container-item">
- <span>绔�</span>
+ <span>宸ヤ綅1鐩爣绔�</span>
<label><input id="staNo" 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>鎺�</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>鍒�</span>
+ <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 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,9 +205,9 @@
<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>-->
@@ -223,65 +223,65 @@
</div>
<!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
- <div class="crn-output-board">
- <textarea id="crn-output"></textarea>
+ <div class="rgv-output-board">
+ <textarea id="rgv-output"></textarea>
</div>
</div>
</div>
</body>
<script>
// 绌虹櫧琛屾暟
- var crnStateTableBlankRows = 0;
- var crnMsgTableBlankRows = 0;
+ var rgvStateTableBlankRows = 0;
+ var rgvMsgTableBlankRows = 0;
// 瀹為檯琛屾暟
- var crnStateTableFullRows = 0;
- var crnMsgTableFullRows = 0;
+ var rgvStateTableFullRows = 0;
+ var rgvMsgTableFullRows = 0;
// 鍒濆鍖�
- var crnOutputDom = document.getElementById("crn-output");
+ var rgvOutputDom = document.getElementById("rgv-output");
$(document).ready(function() {
- getCommandLog();
- initCrnStateTable();
- getCrnStateInfo();
- initCrnMsgTable();
- getCrnMsgInfo();
+ // getCommandLog();
+ initRgvStateTable();
+ getRgvStateInfo();
+ initRgvMsgTable();
+ getRgvMsgInfo();
operatorBlockShow();
});
// 鏁版嵁鏇存柊
setInterval(function () {
- getCrnStateInfo();
- getCrnMsgInfo();
- getCommandLog();
+ getRgvStateInfo();
+ getRgvMsgInfo();
+ // getCommandLog();
},1000);
setInterval(function () {
- getCrnOutput();
+ getRgvOutput();
operatorBlockShow();
- initDemo();
+ // initDemo();
},500);
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
function operatorBlockShow() {
if (parent.systemRunning) {
- $('.crn-operation').css("opacity", "0.5");
- $('.crn-operation-shade').show();
- $('.crn-operation-shade-span').show();
+ $('.rgv-operation').css("opacity", "0.5");
+ $('.rgv-operation-shade').show();
+ $('.rgv-operation-shade-span').show();
} else {
- $('.crn-operation').css("opacity", "1");
- $('.crn-operation-shade').hide();
- $('.crn-operation-shade-span').hide();
+ $('.rgv-operation').css("opacity", "1");
+ $('.rgv-operation-shade').hide();
+ $('.rgv-operation-shade-span').hide();
}
}
- // 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
+ // 鑾峰彇RGV鎵ц涓殑鍛戒护
function getCommandLog() {
$.ajax({
- url: baseUrl + "/crn/command/ongoing",
+ url: baseUrl + "/rgv/command/ongoing",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
if (res.code === 200) {
var commands = res.data;
for (var i=0; i<commands.length;i++){
- $("#crn"+commands[i].crnNo).val(commands[i].command);
+ $("#rgv"+commands[i].rgvNo).val(commands[i].command);
}
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
@@ -293,32 +293,35 @@
}
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
- function getCrnStateInfo() {
+ function getRgvStateInfo() {
var tableEl = $('#rgv-state-table');
$.ajax({
- url: baseUrl+ "/crn/table/crn/state",
+ url: baseUrl+ "/rgv/table/rgv/state",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ console.log(res)
if (res.code === 200){
var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
- initCrnStateTable(table.length-crnStateTableBlankRows);
- crnStateTableFullRows = table.length;
+ if (table.length > rgvStateTableBlankRows && table.length !== rgvStateTableFullRows) {
+ initRgvStateTable(table.length-rgvStateTableBlankRows);
+ rgvStateTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].crnNo);
+ setVal(tr.children("td").eq(0), table[i-1].rgvNo);
setVal(tr.children("td").eq(1), table[i-1].statusType);
setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].loading);
- setVal(tr.children("td").eq(4), table[i-1].bay);
- setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].forkOffset);
- setVal(tr.children("td").eq(7), table[i-1].liftPos);
- setVal(tr.children("td").eq(8), table[i-1].walkPos);
- setVal(tr.children("td").eq(9), table[i-1].warnCode);
- setVal(tr.children("td").eq(10), table[i-1].alarm);
+ setVal(tr.children("td").eq(3), table[i-1].workNo1);
+ setVal(tr.children("td").eq(4), table[i-1].status1);
+ setVal(tr.children("td").eq(5), table[i-1].loading1);
+ setVal(tr.children("td").eq(6), table[i-1].rgvPos);
+ setVal(tr.children("td").eq(7), table[i-1].walkPos);
+ setVal(tr.children("td").eq(8), table[i-1].workNo2);
+ setVal(tr.children("td").eq(9), table[i-1].status2);
+ setVal(tr.children("td").eq(10), table[i-1].loading2);
+ setVal(tr.children("td").eq(11), table[i-1].warnCode);
+ setVal(tr.children("td").eq(12), table[i-1].alarm);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -330,22 +333,22 @@
}
// 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
- function getCrnMsgInfo() {
+ function getRgvMsgInfo() {
var tableEl = $('#rgv-msg-table');
$.ajax({
- url: baseUrl+ "/crn/table/crn/msg",
+ url: baseUrl+ "/rgv/table/rgv/msg",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
if (res.code === 200){
var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnMsgTableFullRows) {
- initCrnStateTable(table.length-crnStateTableBlankRows);
- crnMsgTableFullRows = table.length;
+ if (table.length > rgvStateTableBlankRows && table.length !== rgvMsgTableFullRows) {
+ initRgvStateTable(table.length-rgvStateTableBlankRows);
+ rgvMsgTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].crnNo);
+ 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);
@@ -372,7 +375,7 @@
// 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
function getReqParam() {
- var crnNo = $('input[name="crnSelect"]:checked').val();
+ var rgvNo = $('input[name="rgvSelect"]:checked').val();
var sourceStaNo = $('#sourceStaNo').val();
var sourceRow = $('#sourceRow').val();
var sourceBay = $('#sourceBay').val();
@@ -382,7 +385,7 @@
var bay = $('#bay').val();
var lev = $('#lev').val();
return {
- crnNo: crnNo,
+ rgvNo: rgvNo,
sourceStaNo: sourceStaNo,
sourceRow: sourceRow,
sourceBay: sourceBay,
@@ -396,98 +399,98 @@
// 鍏ュ簱
function put() {
- http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/put", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍑哄簱
function take() {
- http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/take", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 搴撲綅杞Щ
function stockMove() {
- http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/stockMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 绔欏埌绔�
function siteMove() {
- http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/siteMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍧愭爣绉诲姩
function coorMove() {
- http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/coorMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍥炲師鐐�
function bacOrigin() {
- http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/bacOrigin", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍥炲師鐐�
function reverseOrigin() {
- http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/reverseOrigin", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 浠诲姟瀹屾垚
function taskComplete() {
- http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/taskComplete", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鏆傚仠
function pause() {
- http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍚姩
function boot() {
- http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/boot", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 娓呴櫎鍛戒护
function clearCommand() {
- http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/clearCommand", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鎵嬪姩澶嶄綅
function handleReset() {
- http.post(baseUrl+"/crn/operator/handleReset", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/handleReset", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
- function getCrnOutput() {
+ function getRgvOutput() {
$.ajax({
- url: baseUrl + "/crn/output/site",
+ url: baseUrl + "/rgv/output/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
console.log(res)
if (res.code === 200) {
- crnOutput(res.data);
+ rgvOutput(res.data);
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
} else {
@@ -500,14 +503,14 @@
// ------------------------------------------------------------------------------------------------
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ----- 琛ㄤ竴
- function initCrnStateTable(row) {
+ function initRgvStateTable(row) {
var line;
if (row === undefined){
var one = $('#rgv-state-table thead').height();
- var total = $('.crn-state').height();
+ var total = $('.rgv-state').height();
var count = total / one;
count = parseInt(count) - 1;
- crnStateTableBlankRows = count;
+ rgvStateTableBlankRows = count;
line = count;
} else {
line = row;
@@ -526,20 +529,22 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#rgv-state-table tbody').after(html);
}
// 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ----- 琛ㄤ簩
- function initCrnMsgTable(row) {
+ function initRgvMsgTable(row) {
var line;
if (row === undefined){
var one = $('#rgv-msg-table thead').height();
- var total = $('.crn-msg').height();
+ var total = $('.rgv-msg').height();
var count = total / one;
count = parseInt(count) - 1;
- crnMsgTableBlankRows = count;
+ rgvMsgTableBlankRows = count;
line = count;
} else {
line = row;
@@ -567,76 +572,9 @@
}
// 鏃ュ織杈撳嚭妗�
- function crnOutput(content){
- crnOutputDom.value += content;
- crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
- }
-
-
- var crnDemoData;
- function initDemo() {
- $.ajax({
- url: baseUrl+"/crn/demo/status",
- async: false,
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- crnDemoData = res.data;
- crnDemoData.forEach(function (e) {
- $("#demoBtn-"+e.crnNo).html(e.demo?'鍋滄':'婕旂ず');
- })
- } else if (res.code === 403){
- parent.location.href = baseUrl+"/login";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- }
-
- function demoSwitch(el) {
- var crnId = el.split("-")[1];
- var opt;
- if (crnDemoData == null) {
- initDemo();
- }
- for (var i = 0; i<crnDemoData.length; i++) {
- if (Number(crnDemoData[i].crnNo) === Number(crnId)) {
- opt = !crnDemoData[i].demo;
- }
- }
- layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
- doDemo(crnId, 'root', opt); // 鍋滄wcs绯荤粺
- });
- }
-
- function doDemo(crnId, password, opt) {
- // 鍔犺浇tips
- var index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- $.ajax({
- url: baseUrl+ "/crn/demo/switch",
- headers: {'token': localStorage.getItem('token')},
- // async: false,
- data: {
- crnId: Number(crnId),
- password: password,
- opt: opt
- },
- method: 'POST',
- success: function (res) {
- layer.close(index);
- if (res.code === 200){
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
-
+ function rgvOutput(content){
+ rgvOutputDom.value += content;
+ rgvOutputDom.scrollTop = rgvOutputDom.scrollHeight;
}
</script>
--
Gitblit v1.9.1