From 433040dfff973bc8e502a00b2f1bee2e929fdf70 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 16 一月 2021 16:01:10 +0800
Subject: [PATCH] #堆垛机异常

---
 src/main/webapp/views/crn.html |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 70068ac..0a247fa 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -75,10 +75,10 @@
                     <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>
@@ -98,7 +98,6 @@
                 <th>鐩爣绔�</th>
                 <th>婧愬簱浣�</th>
                 <th>鐩爣搴撲綅</th>
-                <th>寮傚父</th>
                 <th>璧拌閫熷害锛坢/min)</th>
                 <th>鍗囬檷閫熷害锛坢/min)</th>
                 <th>鍙夌墮閫熷害锛坢/min)</th>
@@ -330,14 +329,13 @@
                         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].xspeed);
-                        setVal(tr.children("td").eq(9), table[i-1].yspeed);
-                        setVal(tr.children("td").eq(10), table[i-1].zspeed);
-                        setVal(tr.children("td").eq(11), table[i-1].xdistance);
-                        setVal(tr.children("td").eq(12), table[i-1].ydistance);
-                        setVal(tr.children("td").eq(13), table[i-1].xduration);
-                        setVal(tr.children("td").eq(14), table[i-1].yduration);
+                        setVal(tr.children("td").eq(7), table[i-1].xspeed);
+                        setVal(tr.children("td").eq(8), table[i-1].yspeed);
+                        setVal(tr.children("td").eq(9), table[i-1].zspeed);
+                        setVal(tr.children("td").eq(10), table[i-1].xdistance);
+                        setVal(tr.children("td").eq(11), table[i-1].ydistance);
+                        setVal(tr.children("td").eq(12), table[i-1].xduration);
+                        setVal(tr.children("td").eq(13), table[i-1].yduration);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -527,7 +525,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" +

--
Gitblit v1.9.1