From 4da8f89dead33590628b7f17a4d9c2e893ebd9d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 八月 2020 10:08:11 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7ba4b80..7ae4d2b 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">
@@ -61,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>
@@ -153,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>
@@ -282,15 +280,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].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){
                     window.location.href = baseUrl+"/login";
@@ -364,6 +359,13 @@
     // 鍥炲師鐐�
     function bacOrigin() {
         http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
+    // 鍥炲師鐐�
+    function reverseOrigin() {
+        http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
             layer.msg(res.msg);
         });
     }
@@ -463,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