From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pipeline.html |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 9c35d6e..9dd0be1 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -22,12 +22,12 @@
     <div id="plc-error" class="main-board" style="padding-left: 10px">
         <!-- 澶撮儴 -->
         <div class="plc-log-header">
-            <div style="height: 40%">
-                <span>涓滀晶PLC鎵ц鎸囦护</span>
-            </div>
-            <div style="height: 40%">
-                <span>瑗夸晶PLC鎵ц鎸囦护</span>
-            </div>
+<!--            <div style="height: 40%">-->
+<!--                <span>涓滀晶PLC鎵ц鎸囦护</span>-->
+<!--            </div>-->
+<!--            <div style="height: 40%">-->
+<!--                <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
+<!--            </div>-->
             <div>
                 <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
             </div>
@@ -62,7 +62,7 @@
                     <th>鏈夌墿</th>
                     <th>鍙叆</th>
                     <th>鍙嚭</th>
-                    <th>闇�姹�1</th>
+                    <th>鍏ュ簱鏍囪</th>
                     <th>绌烘澘淇″彿</th>
                     <th>鐩爣绔�</th>
                 </tr>
@@ -94,6 +94,12 @@
             <label class="form-label">鐩爣绔�:</label>
             <div class="form-input">
                 <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+            </div>
+        </div>
+        <div class="form-item">
+            <label class="form-label">鍏ュ簱鏍囪:</label>
+            <div class="form-input">
+                <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
             </div>
         </div>
         <div class="form-item form-button-container">
@@ -147,7 +153,7 @@
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -175,14 +181,14 @@
                         setVal(tr.children("td").eq(3), table[i-1].loading);
                         setVal(tr.children("td").eq(4), table[i-1].inEnable);
                         setVal(tr.children("td").eq(5), table[i-1].outEnable);
-                        setVal(tr.children("td").eq(6), table[i-1].inreq1);
+                        setVal(tr.children("td").eq(6), table[i-1].pakMk);
                         setVal(tr.children("td").eq(7), table[i-1].emptyMk);
-                        setVal(tr.children("td").eq(9), table[i-1].staNo);
+                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -280,7 +286,7 @@
                 offset: 'rt',
                 anim: 5,
                 shade: [0],
-                area: ['340px', '215px'],
+                area: ['340px', '255px'],
                 closeBtn: 0,
                 content: $("#site-detl"),
                 success: function(layero, index){
@@ -288,12 +294,14 @@
                         $('#siteId').val(siteId);
                         $('#workNo').val(res.data.workNo);
                         $('#staNo').val(res.data.staNo);
+                        $('#pakMk').val(res.data.pakMk);
                     })
                 },
                 end: function () {
                     $('#siteId').val("");
                     $('#workNo').val("");
                     $('#staNo').val("");
+                    $('#pakMk').val("");
                 }
             })
         }
@@ -303,7 +311,8 @@
         http.post(baseUrl+ "/site//detl/update", {
             siteId: $('#siteId').val(),
             workNo: $('#workNo').val(),
-            staNo:  $('#staNo').val()
+            staNo:  $('#staNo').val(),
+            pakMk: $('#pakMk').val()
         }, function (res) {
             layer.msg("淇敼鎴愬姛",{icon: 1,});
         })
@@ -312,6 +321,7 @@
         $('#siteId').val("");
         $('#workNo').val("");
         $('#staNo').val("");
+        $('#pakMk').val("");
         layer.close(layerDetl);
     })
 

--
Gitblit v1.9.1