From fb74f60f1d8397acf5251ae289e80ab8a056857f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 09 十月 2025 09:08:05 +0800
Subject: [PATCH] #和得服务器

---
 src/main/webapp/views/rgv.html |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index a36ad90..1fad76a 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -91,18 +91,19 @@
                     <tr>
                         <th>RGV</th>
                         <th>褰撳墠妯″紡</th>
-                        <th>褰撳墠鐘舵��</th>
+<!--                        <th>褰撳墠鐘舵��</th>-->
                         <th>浠诲姟鍙�</th>
                         <th>宸ヤ綔鐘舵��</th>
                         <th>鏈夌墿</th>
                         <th>RGV浣嶇疆</th>
-                        <th>璧拌瀹氫綅</th>
-<!--                        <th>浠诲姟鍙�2</th>-->
-<!--                        <th>鐘舵��2</th>-->
-<!--                        <th>鏈夌墿2</th>-->
+<!--                        <th>璧拌瀹氫綅</th>-->
                         <th>鏁呴殰浠g爜</th>
                         <th>鏁呴殰鎻忚堪</th>
-                        <th>閿佸畾鐘舵��</th>
+                        <th>鍏ュ簱鏍囪</th>
+                        <th>鍑哄簱鏍囪</th>
+                        <th>浼樺厛鏀捐揣</th>
+<!--                        <th>鎺ラ┏鏍囪</th>-->
+                        <th>杩炵画鍙栬揣</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -326,7 +327,7 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             success: function (res) {
-                // console.log(res)
+                // console.log(res);
                 if (res.code === 200){
                     var table = res.data;
                     if (table.length > rgvStateTableBlankRows && table.length !== rgvStateTableFullRows) {
@@ -337,18 +338,21 @@
                         var tr = tableEl.find("tr").eq(i);
                         setVal(tr.children("td").eq(0), table[i-1].rgvNo);
                         setVal(tr.children("td").eq(1), table[i-1].statusType);
-                        setVal(tr.children("td").eq(2), table[i-1].status);
-                        setVal(tr.children("td").eq(3), table[i-1].workNo1);
-                        setVal(tr.children("td").eq(4), table[i-1].status1);
-                        setVal(tr.children("td").eq(5), table[i-1].loading1);
-                        setVal(tr.children("td").eq(6), table[i-1].rgvPos1);
-                        setVal(tr.children("td").eq(7), table[i-1].walkPos);
+                        setVal(tr.children("td").eq(2), table[i-1].workNo1);
+                        setVal(tr.children("td").eq(3), table[i-1].status1);
+                        setVal(tr.children("td").eq(4), table[i-1].loading1);
+                        setVal(tr.children("td").eq(5), table[i-1].rgvPos1);
+                        // setVal(tr.children("td").eq(6), table[i-1].walkPos);
                         // setVal(tr.children("td").eq(8), table[i-1].workNo2);
                         // setVal(tr.children("td").eq(9), table[i-1].status2);
                         // setVal(tr.children("td").eq(10), table[i-1].loading2);
-                        setVal(tr.children("td").eq(8), table[i-1].warnCode);
-                        setVal(tr.children("td").eq(9), table[i-1].alarm);
-                        setVal(tr.children("td").eq(10), table[i-1].pakMk);
+                        setVal(tr.children("td").eq(6), table[i-1].warnCode);
+                        setVal(tr.children("td").eq(7), table[i-1].alarm);
+                        setVal(tr.children("td").eq(8), table[i-1].pakIn);
+                        setVal(tr.children("td").eq(9), table[i-1].pakOut);
+                        setVal(tr.children("td").eq(10), table[i-1].pakRgv);
+                        setVal(tr.children("td").eq(11), table[i-1].pakAll);
+
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";

--
Gitblit v1.9.1