From 268d58a278c6e93f2ebbd567686e70383aacfea4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 03 七月 2020 14:16:23 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 202 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 2a5be06..ec56bd0 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" type="text/css" href="../static/css/crn.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>
<style>
</style>
@@ -81,14 +82,21 @@
<!-- 鎵嬪姩鎿嶄綔 -->
<div class="crn-operation">
+ <!-- 閬僵灞� -->
+ <div class="crn-operation-shade">
+ <span class="crn-operation-shade-span">
+ WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
+ </span>
+ </div>
+
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
<div id="crn-select" class="operator-item">
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container">
- <label><input type="radio" name="crn" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crn" value="2"> 2鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -97,19 +105,19 @@
<div class="select-container">
<div class="select-container-item">
<span>绔�</span>
- <label><input type="number" name="points" min="0" /></label>
+ <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceRow" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="sourceLev" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
</div>
</div>
@@ -119,19 +127,19 @@
<div class="select-container">
<div class="select-container-item">
<span>绔�</span>
- <label><input type="number" name="points" min="0" /></label>
+ <label><input id="staNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="row" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
+ <label><input id="lev" type="number" name="points" min="0" style="background-color: #a9eeff" /></label>
</div>
</div>
</div>
@@ -142,16 +150,16 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item">鍏ュ簱</button>
- <button class="item">鍑哄簱</button>
- <button class="item">搴撲綅杞Щ</button>
- <button class="item">绔欏埌绔�</button>
- <button class="item">鍧愭爣绉诲姩</button>
- <button class="item">鍥炲師鐐�</button>
- <button class="item">浠诲姟瀹屾垚</button>
- <button class="item">鏆傚仠</button>
- <button class="item">鍚姩</button>
- <button class="item">娓呴櫎鍛戒护</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="coorMove()">鍧愭爣绉诲姩</button>
+ <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>
+ <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+ <button class="item" onclick="pause()">鏆傚仠</button>
+ <button class="item" onclick="boot()">鍚姩</button>
+ <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
</div>
</fieldset>
</div>
@@ -163,7 +171,6 @@
</div>
</body>
<script>
-
// 绌虹櫧琛屾暟
var crnStateTableBlankRows = 0;
var crnMsgTableBlankRows = 0;
@@ -173,18 +180,57 @@
// 鍒濆鍖�
var crnOutputDom = document.getElementById("crn-output");
$(document).ready(function() {
+ getCommandLog();
initCrnStateTable();
getCrnStateInfo();
initCrnMsgTable();
+ getCrnMsgInfo();
+ operatorBlockShow();
});
// 鏁版嵁鏇存柊
setInterval(function () {
getCrnStateInfo();
- },500);
+ getCrnMsgInfo();
+ getCommandLog();
+ },1000);
setInterval(function () {
getSiteOutput();
+ operatorBlockShow();
},500);
+ // 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
+ function operatorBlockShow() {
+ if (systemRunning) {
+ $('.crn-operation').css("opacity", "0.5");
+ $('.crn-operation-shade').show();
+ $('.crn-operation-shade-span').show();
+ } else {
+ $('.crn-operation').css("opacity", "1");
+ $('.crn-operation-shade').hide();
+ $('.crn-operation-shade-span').hide();
+ }
+ }
+
+ // 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
+ function getCommandLog() {
+ $.ajax({
+ url: baseUrl + "/crn/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);
+ }
+ } else if (res.code === 403) {
+ window.location.href = baseUrl + "/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ })
+ }
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getCrnStateInfo() {
@@ -217,7 +263,7 @@
setVal(tr.children("td").eq(12), table[i-1].warnCode);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -225,7 +271,138 @@
});
}
- // 杈撻�佽澶囨棩蹇楄緭鍑�
+ // 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
+ function getCrnMsgInfo() {
+ var tableEl = $('#crn-msg-table');
+ $.ajax({
+ url: baseUrl+ "/crn/table/crn/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;
+ }
+ 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(1), table[i-1].status);
+ setVal(tr.children("td").eq(2), table[i-1].workNo);
+ setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
+ 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].error);
+ setVal(tr.children("td").eq(8), table[i-1].origin);
+ setVal(tr.children("td").eq(9), table[i-1].command);
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+ }
+
+ // 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
+
+ function getReqParam() {
+ var crnNo = $('input[name="crnSelect"]:checked').val();
+ var sourceStaNo = $('#sourceStaNo').val();
+ var sourceRow = $('#sourceRow').val();
+ var sourceBay = $('#sourceBay').val();
+ var sourceLev = $('#sourceLev').val();
+ var staNo = $('#staNo').val();
+ var row = $('#row').val();
+ var bay = $('#bay').val();
+ var lev = $('#lev').val();
+ return {
+ crnNo: crnNo,
+ sourceStaNo: sourceStaNo,
+ sourceRow: sourceRow,
+ sourceBay: sourceBay,
+ sourceLev: sourceLev,
+ staNo: staNo,
+ row: row,
+ bay: bay,
+ lev: lev
+ };
+ }
+
+ // 鍏ュ簱
+ function put() {
+ http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鍑哄簱
+ function take() {
+ http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 搴撲綅杞Щ
+ function stockMove() {
+ http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 绔欏埌绔�
+ function siteMove() {
+ http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鍧愭爣绉诲姩
+ function coorMove() {
+ http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鍥炲師鐐�
+ function bacOrigin() {
+ http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 浠诲姟瀹屾垚
+ function taskComplete() {
+ http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鏆傚仠
+ function pause() {
+ http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鍚姩
+ function boot() {
+ http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 娓呴櫎鍛戒护
+ function clearCommand() {
+ http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
+ // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
function getSiteOutput() {
$.ajax({
url: baseUrl + "/crn/output/site",
@@ -235,7 +412,7 @@
if (res.code === 200) {
crnOutput(res.data);
} else if (res.code === 403) {
- top.location.href = baseUrl + "/login";
+ window.location.href = baseUrl + "/login";
} else {
alert(res.msg);
}
@@ -315,8 +492,6 @@
crnOutputDom.value += content;
crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
}
-
-
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1