From 006ca71bd84497f2ff53630a3f9257f7a6e29391 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 06 一月 2022 08:49:10 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 70068ac..957777c 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>
     <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -75,10 +93,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 +116,6 @@
                 <th>鐩爣绔�</th>
                 <th>婧愬簱浣�</th>
                 <th>鐩爣搴撲綅</th>
-                <th>寮傚父</th>
                 <th>璧拌閫熷害锛坢/min)</th>
                 <th>鍗囬檷閫熷害锛坢/min)</th>
                 <th>鍙夌墮閫熷害锛坢/min)</th>
@@ -130,6 +147,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>
         <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -330,14 +350,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";
@@ -541,7 +560,6 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
-                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-msg-table tbody').after(html);
@@ -621,4 +639,4 @@
     }
 
 </script>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1