From 2aeea7b010e96f74a52bc4ed5873c41c177a5953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 14:09:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7ae4d2b..7f74fb4 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -48,6 +48,7 @@
                     <th>灞�</th>
                     <th>璐у弶浣嶇疆</th>
                     <th>杞借揣鍙颁綅缃�</th>
+                    <th>寮傚父鐮�</th>
                 </tr>
             </thead>
             <tbody>
@@ -67,6 +68,7 @@
                 <th>鐩爣绔�</th>
                 <th>婧愬簱浣�</th>
                 <th>鐩爣搴撲綅</th>
+                <th>寮傚父</th>
             </tr>
         </thead>
         <tbody>
@@ -90,7 +92,7 @@
             <span class="select-title">鍫嗗灈鏈哄彿</span>
             <div class="select-container">
                 <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
-                <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>
+<!--                <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>-->
             </div>
         </div>
         <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -148,13 +150,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="clearCommand()">娓呴櫎鍛戒护</button>
+                <button class="item" onclick="handleReset()">澶嶄綅</button>
             </div>
         </fieldset>
     </div>
@@ -189,7 +192,7 @@
         getCommandLog();
     },1000);
     setInterval(function () {
-        getSiteOutput();
+        getCrnOutput();
         operatorBlockShow();
     },500);
 
@@ -253,6 +256,7 @@
                         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);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -286,6 +290,7 @@
                         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(6), table[i-1].error);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -398,8 +403,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')},
@@ -444,6 +456,7 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-state-table tbody').after(html);
@@ -472,6 +485,7 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-msg-table tbody').after(html);

--
Gitblit v1.9.1