From ae71b59d481be89095b4035307b5c679c1832fe0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 八月 2020 10:07:25 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 74 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index ef2f2b1..b676a60 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -39,18 +39,15 @@
<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>瀹屾垚</th>
- <th>浠诲姟鍙�</th>
- <th>鐘舵��</th>
- <th>鎶ヨ鐮�</th>
+ <th>杞借揣鍙颁綅缃�</th>
</tr>
</thead>
<tbody>
@@ -64,15 +61,12 @@
<thead>
<tr>
<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>
@@ -82,7 +76,8 @@
<!-- 鎵嬪姩鎿嶄綔 -->
<div class="crn-operation">
- <div class="crn-operation-shade" onclick="layer.msg('璇峰仠姝� WCS 绯荤粺鍚庢搷浣�');">
+ <!-- 閬僵灞� -->
+ <div class="crn-operation-shade">
<span class="crn-operation-shade-span">
WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
</span>
@@ -155,9 +150,10 @@
<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="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>
</div>
</fieldset>
@@ -199,7 +195,7 @@
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
function operatorBlockShow() {
- if (top.systemRunning) {
+ if (parent.systemRunning) {
$('.crn-operation').css("opacity", "0.5");
$('.crn-operation-shade').show();
$('.crn-operation-shade-span').show();
@@ -223,14 +219,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);
}
}
})
}
-
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getCrnStateInfo() {
@@ -249,21 +244,18 @@
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(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(12), table[i-1].warnCode);
+ setVal(tr.children("td").eq(1), table[i-1].workNo);
+ setVal(tr.children("td").eq(2), table[i-1].statusType);
+ setVal(tr.children("td").eq(3), table[i-1].status);
+ setVal(tr.children("td").eq(4), table[i-1].warn);
+ setVal(tr.children("td").eq(5), table[i-1].loading);
+ setVal(tr.children("td").eq(6), table[i-1].bay);
+ setVal(tr.children("td").eq(7), table[i-1].lev);
+ setVal(tr.children("td").eq(8), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(9), table[i-1].liftPos);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -288,18 +280,15 @@
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);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -374,6 +363,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) {
@@ -412,7 +408,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);
}
@@ -448,9 +444,6 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
" </tr>\n";
}
$('#crn-state-table tbody').after(html);
@@ -472,9 +465,6 @@
var html = "";
for (var i = 0; i < line; i ++){
html += " <tr>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1