From e3fcf332eff28c90c31dc5f982035d50691fa9c3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 15:32:18 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   38 +++++++++++++++++++++++---------------
 1 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7f74fb4..63584a2 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -27,11 +27,11 @@
             <span>&nbsp;</span>
             <input id="crn1" disabled="disabled">
         </div>
-<!--        <div class="crn-command-item">-->
-<!--            <label>2#</label>-->
-<!--            <span>&nbsp;</span>-->
-<!--            <input id="crn2" disabled="disabled">-->
-<!--        </div>-->
+        <div class="crn-command-item">
+            <label>2#</label>
+            <span>&nbsp;</span>
+            <input id="crn2" disabled="disabled">
+        </div>
     </div>
     <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
     <div class="crn-state">
@@ -42,12 +42,14 @@
                     <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>
@@ -245,18 +247,22 @@
                         crnStateTableFullRows = table.length;
                     }
                     for (var i=1;i<=table.length;i++){
+                        console.log(table);
+                         // todo:luxiaotao
                         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].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);
-                        setVal(tr.children("td").eq(10), table[i-1].warnCode);
+                        setVal(tr.children("td").eq(4), table[i-1].loading);
+                        setVal(tr.children("td").eq(5), table[i-1].bay);
+                        setVal(tr.children("td").eq(6), table[i-1].lev);
+                        setVal(tr.children("td").eq(7), table[i-1].xorigin);
+                        setVal(tr.children("td").eq(8), table[i-1].yorigin);
+                        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){
                     window.location.href = baseUrl+"/login";
@@ -457,6 +463,8 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-state-table tbody').after(html);

--
Gitblit v1.9.1