From ddf4e077b77a990c6b7960eb77f2b95e2d475a0b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 四月 2024 15:39:50 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   29 ++++++-----------------------
 1 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 3999603..5bd72a4 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -65,24 +65,6 @@
                     <!--            <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>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
             <div class="crn-state">
@@ -100,6 +82,7 @@
                         <th>璧拌鍦ㄥ畾浣�</th>
                         <th>鏁呴殰浠ｇ爜</th>
                         <th>鏁呴殰鎻忚堪</th>
+                        <th>浠诲姟鍏佽涓嬪彂鏍囪</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -145,14 +128,11 @@
             <!-- 璁惧浠诲姟閫夋嫨 -->
             <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>
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -320,6 +300,7 @@
                         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);
+                        setVal(tr.children("td").eq(11), table[i-1].cmdFlag);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -486,6 +467,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) {
@@ -526,6 +508,7 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-state-table tbody').after(html);

--
Gitblit v1.9.1