From 8e120d28b0c2c95c7bdc4b8c33a96e0eb875291a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 15:39:42 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 3d4f323..04c02b2 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -70,13 +70,13 @@
                     <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>
@@ -100,10 +100,10 @@
                 <th>璧拌閫熷害锛坢/min)</th>
                 <th>鍗囬檷閫熷害锛坢/min)</th>
                 <th>鍙夌墮閫熷害锛坢/min)</th>
-                <th>璧拌璺濈(Km)</th>
-                <th>鍗囬檷璺濈(Km)</th>
-                <th>璧拌鏃堕暱(H)</th>
-                <th>鍗囬檷鏃堕暱(H)</th>
+                <th>璧拌璺濈(m)</th>
+                <th>鍗囬檷璺濈(m)</th>
+                <th>璧拌鏃堕暱(s)</th>
+                <th>鍗囬檷鏃堕暱(s)</th>
             </tr>
         </thead>
         <tbody>
@@ -287,13 +287,13 @@
                         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].xorigin);
-                        setVal(tr.children("td").eq(7), table[i-1].yorigin);
+                        setVal(tr.children("td").eq(6), table[i-1].liftPos);
+                        setVal(tr.children("td").eq(7), table[i-1].sitePos);
                         setVal(tr.children("td").eq(8), table[i-1].forkOffset);
-                        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);
+                        setVal(tr.children("td").eq(9), table[i-1].alarm1);
+                        setVal(tr.children("td").eq(10), table[i-1].alarm2);
+                        setVal(tr.children("td").eq(11), table[i-1].alarm3);
+                        setVal(tr.children("td").eq(12), table[i-1].alarm4);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";

--
Gitblit v1.9.1