From 58d3d34b740a07099384152e0024e6c09891eca5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 28 十月 2025 16:30:30 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index ea6ca3b..77ba3f9 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -132,6 +132,10 @@
                     <th>鍗囬檷璺濈(Km)</th>
                     <th>璧拌鏃堕暱(H)</th>
                     <th>鍗囬檷鏃堕暱(H)</th>
+                    <th>鍏ュ簱浠诲姟涓婇檺</th>
+                    <th>褰撳墠鍏ュ簱浠诲姟</th>
+                    <th>鎬讳换鍔℃暟閲忎笂闄�</th>
+                    <th>褰撳墠鎬讳换鍔℃暟閲�</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -159,6 +163,7 @@
                         <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>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -218,7 +223,7 @@
                         <button class="item" onclick="siteMove()">绔欏埌绔�</button>
                         <!--                <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
                         <!--                <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
-                        <!--                <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
+                        <button class="item" onclick="coorMove()">鍫嗗灈鏈虹Щ鍔�</button>
                         <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
                         <!--                <button class="item" onclick="pause()">鏆傚仠</button>-->
                         <!--                <button class="item" onclick="boot()">鍚姩</button>-->
@@ -351,6 +356,7 @@
                         crnMsgTableFullRows = table.length;
                     }
                     for (var i=1;i<=table.length;i++){
+                        console.log(table[i-1])
                         var tr = tableEl.find("tr").eq(i);
                         setVal(tr.children("td").eq(0), table[i-1].crnNo);
                         setVal(tr.children("td").eq(1), table[i-1].workNo);
@@ -366,6 +372,20 @@
                         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(14), table[i-1].crnSearchDetectTaskCount);
+
+                        let currentInTask = "<span>" + table[i-1].currentInTask + "</span>";
+                        if (table[i - 1].currentInTask > table[i - 1].crnSearchDetectTaskCount) {
+                            currentInTask = "<span style='color: red;font-weight: bolder;'>" + table[i-1].currentInTask + "</span>";
+                        }
+                        setVal(tr.children("td").eq(15), currentInTask);
+
+                        setVal(tr.children("td").eq(16), table[i-1].applyInTaskTotalCount);
+                        let currentTotalTask = "<span>" + table[i-1].currentTotalTask + "</span>";
+                        if (table[i - 1].currentTotalTask > table[i - 1].applyInTaskTotalCount) {
+                            currentTotalTask = "<span style='color: red;font-weight: bolder;'>" + table[i-1].currentTotalTask + "</span>";
+                        }
+                        setVal(tr.children("td").eq(17), currentTotalTask);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -431,7 +451,7 @@
 
     // 鍧愭爣绉诲姩
     function coorMove() {
-        http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+        http.post(baseUrl+"/crn/operator/crnMove", getReqParam(), function (res) {
             layer.msg(res.msg);
         });
     }
@@ -545,7 +565,7 @@
             var one = $('#crn-msg-table thead').height();
             var total = $('.crn-msg').height();
             var count = total / one;
-            count = parseInt(count) - 1;
+            count = parseInt(count);
             crnMsgTableBlankRows = count;
             line = count;
         } else {
@@ -568,6 +588,10 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#crn-msg-table tbody').after(html);

--
Gitblit v1.9.1