From 538496d2361fb5cd6ab2a48f609a37b5cbfb5e4d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 15:47:01 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index ec56bd0..7ba4b80 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>
@@ -200,7 +197,7 @@
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
function operatorBlockShow() {
- if (systemRunning) {
+ if (parent.systemRunning) {
$('.crn-operation').css("opacity", "0.5");
$('.crn-operation-shade').show();
$('.crn-operation-shade-span').show();
@@ -249,18 +246,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].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){
window.location.href = baseUrl+"/login";
@@ -438,9 +432,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