From 787752a2837f8f3627e280973334fbc23e932210 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期日, 27 九月 2020 16:32:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 144 ++++++++++++++++++++++++++++-------------------
1 files changed, 85 insertions(+), 59 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index e39cd89..82ba4c2 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>
@@ -26,11 +27,6 @@
<span> </span>
<input id="crn1" disabled="disabled">
</div>
- <div class="crn-command-item">
- <label>2#</label>
- <span> </span>
- <input id="crn2" disabled="disabled">
- </div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
@@ -39,17 +35,17 @@
<tr>
<th>鍫嗗灈鏈�</th>
<th>妯″紡</th>
- <th>鎶ヨ</th>
+ <th>鐘舵��</th>
<th>鏈夌墿</th>
<th>鍒�</th>
<th>灞�</th>
+ <th>璧拌鍘熺偣</th>
+ <th>鍗囬檷鍘熺偣</th>
<th>璐у弶浣嶇疆</th>
- <th>鍒楀潗鏍�</th>
- <th>灞傚潗鏍�</th>
- <th>瀹屾垚</th>
- <th>浠诲姟鍙�</th>
- <th>鐘舵��</th>
- <th>鎶ヨ鐮�</th>
+ <th>璧拌瀹氫綅</th>
+ <th>鍗囬檷瀹氫綅</th>
+ <th>鎬ュ仠</th>
+ <th>寮傚父鐮�</th>
</tr>
</thead>
<tbody>
@@ -63,15 +59,20 @@
<thead>
<tr>
<th>鍫嗗灈鏈�</th>
- <th>鐘舵��</th>
<th>宸ヤ綔鍙�</th>
+ <th>鐘舵��</th>
<th>婧愮珯</th>
<th>鐩爣绔�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
<th>寮傚父</th>
- <th>鍘熺偣</th>
- <th>鍛戒护</th>
+ <th>璧拌閫熷害锛坢/min)</th>
+ <th>鍗囬檷閫熷害锛坢/min)</th>
+ <th>鍙夌墮閫熷害锛坢/min)</th>
+ <th>璧拌璺濈(Km)</th>
+ <th>鍗囬檷璺濈(Km)</th>
+ <th>璧拌鏃堕暱(H)</th>
+ <th>鍗囬檷鏃堕暱(H)</th>
</tr>
</thead>
<tbody>
@@ -81,6 +82,7 @@
<!-- 鎵嬪姩鎿嶄綔 -->
<div class="crn-operation">
+ <!-- 閬僵灞� -->
<div class="crn-operation-shade">
<span class="crn-operation-shade-span">
WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
@@ -94,7 +96,6 @@
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -107,15 +108,15 @@
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input id="sourceRow" 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" value="0" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input id="sourceBay" 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" value="0" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input id="sourceLev" 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" value="0" /></label>
</div>
</div>
</div>
@@ -129,15 +130,15 @@
</div>
<div class="select-container-item">
<span>鎺�</span>
- <label><input id="row" 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" value="0" /></label>
</div>
<div class="select-container-item">
<span>鍒�</span>
- <label><input id="bay" 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" value="0" /></label>
</div>
<div class="select-container-item">
<span>灞�</span>
- <label><input id="lev" 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" value="0" /></label>
</div>
</div>
</div>
@@ -152,12 +153,14 @@
<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="reverseOrigin()">鍙嶅師鐐�</button>
+ <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>
<button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
- <button class="item" onclick="pause()">鏆傚仠</button>
- <button class="item" onclick="boot()">鍚姩</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>
</div>
</fieldset>
</div>
@@ -192,13 +195,13 @@
getCommandLog();
},1000);
setInterval(function () {
- getSiteOutput();
+ getCrnOutput();
operatorBlockShow();
},500);
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
function operatorBlockShow() {
- if (top.systemRunning) {
+ if (parent.systemRunning) {
$('.crn-operation').css("opacity", "0.5");
$('.crn-operation-shade').show();
$('.crn-operation-shade-span').show();
@@ -222,14 +225,13 @@
$("#crn"+commands[i].crnNo).val(commands[i].command);
}
} else if (res.code === 403) {
- top.location.href = baseUrl + "/login";
+ window.location.href = baseUrl + "/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
})
}
-
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getCrnStateInfo() {
@@ -248,23 +250,23 @@
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].type);
- setVal(tr.children("td").eq(2), table[i-1].warn);
+ 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].bayCoor);
- setVal(tr.children("td").eq(8), table[i-1].levCoor);
- setVal(tr.children("td").eq(9), table[i-1].complete);
- setVal(tr.children("td").eq(10), table[i-1].workNo);
- setVal(tr.children("td").eq(11), table[i-1].status);
+ setVal(tr.children("td").eq(6), table[i-1].xorigin);
+ setVal(tr.children("td").eq(7), table[i-1].yorigin);
+ setVal(tr.children("td").eq(8), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(9), table[i-1].xlocation);
+ setVal(tr.children("td").eq(10), table[i-1].ylocation);
+ setVal(tr.children("td").eq(11), table[i-1].stop);
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);
+ console.log(res.msg);
}
}
});
@@ -287,20 +289,25 @@
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(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(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);
+ setVal(tr.children("td").eq(8), table[i-1].xspeed);
+ setVal(tr.children("td").eq(9), table[i-1].yspeed);
+ setVal(tr.children("td").eq(10), table[i-1].zspeed);
+ setVal(tr.children("td").eq(11), table[i-1].xdistance);
+ setVal(tr.children("td").eq(12), table[i-1].ydistance);
+ setVal(tr.children("td").eq(13), table[i-1].xduration);
+ setVal(tr.children("td").eq(14), table[i-1].yduration);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -334,75 +341,89 @@
// 鍏ュ簱
function put() {
http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍑哄簱
function take() {
http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 搴撲綅杞Щ
function stockMove() {
http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 绔欏埌绔�
function siteMove() {
http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍧愭爣绉诲姩
function coorMove() {
http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍥炲師鐐�
function bacOrigin() {
http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鍥炲師鐐�
+ function reverseOrigin() {
+ http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
+ layer.msg(res.msg);
});
}
// 浠诲姟瀹屾垚
function taskComplete() {
http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鏆傚仠
function pause() {
http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 鍚姩
function boot() {
http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
});
}
// 娓呴櫎鍛戒护
function clearCommand() {
http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
- alert(res.msg);
+ layer.msg(res.msg);
+ });
+ }
+
+ // 鎵嬪姩澶嶄綅
+ function handleReset() {
+ http.post(baseUrl+"/crn/operator/handleReset", getReqParam(), function (res) {
+ layer.msg(res.msg);
});
}
// 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
- function getSiteOutput() {
+ function getCrnOutput() {
$.ajax({
url: baseUrl + "/crn/output/site",
headers: {'token': localStorage.getItem('token')},
@@ -411,9 +432,9 @@
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);
+ console.log(res.msg);
}
}
})
@@ -481,6 +502,11 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-msg-table tbody').after(html);
--
Gitblit v1.9.1