From a3c99f39f98f5fd1ced3f8b84d0789160c8d72ed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 九月 2020 10:04:58 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index d820bb2..8c19df6 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>
@@ -147,7 +147,7 @@
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });
@@ -175,14 +175,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(8), table[i-1].staNo);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";
                 }  else {
-                    alert(res.msg);
+                    console.log(res.msg);
                 }
             }
         });

--
Gitblit v1.9.1