From 12474e42179051720a23d7c921fd33ce50e9ffab Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 18 二月 2022 16:16:00 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 0a247fa..e4db383 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -47,7 +47,7 @@
 
     <!-- 鎵ц鍛戒护 -->
     <div class="command-log">
-        <h2>鎵ц涓殑鍛戒护</h2>
+        <h3>鎵ц涓殑鍛戒护</h3>
         <div class="crn-command-item">
             <label>1#</label>
             <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
@@ -59,6 +59,24 @@
             <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
             <!--            <span>&nbsp;</span>-->
             <input id="crn2" disabled="disabled">
+        </div>
+        <div class="crn-command-item">
+            <label>3#</label>
+            <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+            <!--            <span>&nbsp;</span>-->
+            <input id="crn3" disabled="disabled">
+        </div>
+        <div class="crn-command-item">
+            <label>4#</label>
+            <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+            <!--            <span>&nbsp;</span>-->
+            <input id="crn4" disabled="disabled">
+        </div>
+        <div class="crn-command-item">
+            <label>5#</label>
+            <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+            <!--            <span>&nbsp;</span>-->
+            <input id="crn5" disabled="disabled">
         </div>
     </div>
     <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -72,13 +90,11 @@
                     <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>
@@ -129,6 +145,9 @@
             <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="3">&nbsp;3鍙峰爢鍨涙満</label>
+                <label><input type="radio" name="crnSelect" value="4">&nbsp;4鍙峰爢鍨涙満</label>
+                <label><input type="radio" name="crnSelect" value="5">&nbsp;5鍙峰爢鍨涙満</label>
             </div>
         </div>
         <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -289,13 +308,11 @@
                         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].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].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);
+                        setVal(tr.children("td").eq(6), table[i-1].forkOffset);
+                        setVal(tr.children("td").eq(7), table[i-1].liftPos);
+                        setVal(tr.children("td").eq(8), table[i-1].walkPos);
+                        setVal(tr.children("td").eq(9), table[i-1].warnCode);
+                        setVal(tr.children("td").eq(10), table[i-1].alarm);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -502,8 +519,6 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-state-table tbody').after(html);
@@ -618,4 +633,4 @@
     }
 
 </script>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1