From 4c72c2172ac6573e0ce9fcc3a6402e1518723833 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 16:13:57 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 46 ++++++++++++++--------------------------------
1 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index abbf01c..f59a72b 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>
@@ -249,18 +243,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";
@@ -288,15 +279,12 @@
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].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){
window.location.href = baseUrl+"/login";
@@ -448,9 +436,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 +457,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