From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 3999603..e9c53c9 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -83,6 +83,12 @@
                     <!--            <span>&nbsp;</span>-->
                     <input id="crn5" disabled="disabled">
                 </div>
+                <div class="crn-command-item">
+                    <label>6#</label>
+                    <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+                    <!--            <span>&nbsp;</span>-->
+                    <input id="crn6" disabled="disabled">
+                </div>
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
             <div class="crn-state">
@@ -119,13 +125,13 @@
                     <th>鐩爣绔�</th>
                     <th>婧愬簱浣�</th>
                     <th>鐩爣搴撲綅</th>
-                    <th>璧拌閫熷害锛坢/min)</th>
-                    <th>鍗囬檷閫熷害锛坢/min)</th>
-                    <th>鍙夌墮閫熷害锛坢/min)</th>
-                    <th>璧拌璺濈(Km)</th>
-                    <th>鍗囬檷璺濈(Km)</th>
-                    <th>璧拌鏃堕暱(H)</th>
-                    <th>鍗囬檷鏃堕暱(H)</th>
+<!--                    <th>璧拌閫熷害锛坢/min)</th>-->
+<!--                    <th>鍗囬檷閫熷害锛坢/min)</th>-->
+<!--                    <th>鍙夌墮閫熷害锛坢/min)</th>-->
+<!--                    <th>璧拌璺濈(Km)</th>-->
+<!--                    <th>鍗囬檷璺濈(Km)</th>-->
+<!--                    <th>璧拌鏃堕暱(H)</th>-->
+<!--                    <th>鍗囬檷鏃堕暱(H)</th>-->
                 </tr>
                 </thead>
                 <tbody>
@@ -145,14 +151,15 @@
             <!-- 璁惧浠诲姟閫夋嫨 -->
             <div class="task-select">
                 <!-- 鍫嗗灈鏈洪�夋嫨 -->
-                <div id="crn-select" class="operator-item">
+                <div id="crn-select" class="operator-item" style="width: 55%">
                     <span class="select-title">鍫嗗灈鏈哄彿</span>
-                    <div class="select-container">
+                    <div class="select-container" style="padding: 20px 0;">
                         <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>
+                        <label><input type="radio" name="crnSelect" value="6">&nbsp;6鍙峰爢鍨涙満</label>
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -353,13 +360,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].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);
+                        // 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";
@@ -486,6 +493,7 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             success: function (res) {
+                console.log(res)
                 if (res.code === 200) {
                     crnOutput(res.data);
                 } else if (res.code === 403) {

--
Gitblit v1.9.1