From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/webapp/views/crn.html | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index abbf01c..bc1fd92 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -40,17 +40,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>
@@ -64,15 +64,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>
@@ -154,12 +159,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>
@@ -194,7 +201,7 @@
getCommandLog();
},1000);
setInterval(function () {
- getSiteOutput();
+ getCrnOutput();
operatorBlockShow();
},500);
@@ -249,17 +256,17 @@
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){
@@ -288,15 +295,20 @@
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){
window.location.href = baseUrl+"/login";
@@ -374,6 +386,13 @@
});
}
+ // 鍥炲師鐐�
+ 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) {
@@ -402,8 +421,15 @@
});
}
+ // 鎵嬪姩澶嶄綅
+ function handleReset() {
+ http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ layer.msg(res.msg);
+ });
+ }
+
// 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
- function getSiteOutput() {
+ function getCrnOutput() {
$.ajax({
url: baseUrl + "/crn/output/site",
headers: {'token': localStorage.getItem('token')},
@@ -482,6 +508,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