From 10ac21082bbbe92dabecdda1a98fe4539f746037 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 09:10:38 +0800
Subject: [PATCH] 1

---
 zy-asc-conveyor/src/main/webapp/views/pipeline.html |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/zy-asc-conveyor/src/main/webapp/views/pipeline.html b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
index 90e4ce0..2505149 100644
--- a/zy-asc-conveyor/src/main/webapp/views/pipeline.html
+++ b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
@@ -786,7 +786,8 @@
                             <th>閲嶉噺淇″彿</th>
                             <th>绌烘弧淇″彿</th>
                             <th>鐩爣绔�</th>
-                            <th>楂樹綆淇″彿</th>
+                            <th>鍙斁/鍙彇</th>
+<!--                            <th>楂樹綆淇″彿</th>-->
                         </tr>
                         </thead>
                         <tbody>
@@ -842,6 +843,7 @@
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" id="save">淇濆瓨</button>
                     <button type="button" class="btn btn-secondary" id="clear">娓呴櫎</button>
+                    <button type="button" class="btn btn-secondary" id="safe">琛ュ厖瀹夊叏淇″彿</button>
                     <button type="button" class="btn btn-secondary" id="cancel">鍙栨秷</button>
                 </div>
             </div>
@@ -990,7 +992,7 @@
                     <td>${site.weight || '--'}</td>
                     <td>${site.emptyMk || '--'}</td>
                     <td>${site.staNo || '--'}</td>
-                    <td>${site.locType1 || '--'}</td>
+                    <td>${site.allow || '--'}</td>
                 </tr>
             `;
         }
@@ -1081,8 +1083,7 @@
             http.post(`${baseUrl}/site/detl/update`, {
                 siteId: $('#siteId').val(),
                 workNo: $('#workNo').val(),
-                staNo: $('#staNo').val(),
-                pakMk: $('#pakMk').val()
+                staNo: $('#staNo').val()
             }, (res) => {
                 showSuccessMessage("淇敼鎴愬姛");
                 setTimeout(() => {
@@ -1097,6 +1098,18 @@
             $('#staNo').val(0);
         });
 
+        // 琛ュ厖瀹夊叏淇″彿
+        $(document).on('click', '#safe', function () {
+            http.post(`${baseUrl}/site/detl/safe`, {
+                siteId: $('#siteId').val()
+            }, (res) => {
+                showSuccessMessage("琛ュ厖鎴愬姛");
+                setTimeout(() => {
+                    closeModal();
+                }, 1500);
+            });
+        });
+
         // 鍙栨秷绔欑偣淇℃伅淇敼
         $(document).on('click', '#cancel', function () {
             closeModal();

--
Gitblit v1.9.1