From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto

---
 src/main/webapp/views/pipeline.html |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index b73dbf2..740d057 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -91,6 +91,8 @@
                         <th>绌烘澘淇″彿</th>
                         <th>鐩爣绔�</th>
                         <th>楂樹綆搴撲綅</th>
+                        <th>鑷姩鍑�</th>
+                        <th>鑷姩鍏�</th>
                     </tr>
                     </thead>
                     <!-- 琛ㄦ牸鍐呭 -->
@@ -279,6 +281,8 @@
                         setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                         setVal(tr.children("td").eq(8), table[i-1].staNo);
                         setVal(tr.children("td").eq(9), table[i-1].locType1);
+                        setVal(tr.children("td").eq(10), table[i-1].autoOut);
+                        setVal(tr.children("td").eq(11), table[i-1].autoIn);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
@@ -365,6 +369,8 @@
                 "       <td></td>\n" +
                 "       <td></td>\n" +
                 "       <td></td>\n" +
+                "       <td></td>\n" +
+                "       <td></td>\n" +
                 "     </tr>\n";
         }
         $('#site-table tbody').after(html);

--
Gitblit v1.9.1