From 01a2d01abeadef5488a100ddf58a22dbcf7b95d6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 20:18:03 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pipeline.html |   60 ++++++++----------------------------------------------------
 1 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index e3af7e1..740d057 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -53,56 +53,6 @@
 
             <!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
             <div id="plc-error" class="main-board" style="padding-left: 10px">
-                <!-- 澶撮儴 -->
-                <div class="plc-log-header">
-                    <!-- 璁惧浠诲姟鎿嶄綔 -->
-                    <div class="io-mode-oper">
-                        <fieldset>
-                            <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>
-                            <div class="io-mode-box">
-                                <label>1F1</label>
-                                <button id="io-mode-1" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>1F2</label>
-                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>1F3</label>
-                                <button id="io-mode-3" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>1F4</label>
-                                <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>2F1</label>
-                                <button id="io-mode-5" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>2F2</label>
-                                <button id="io-mode-6" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>3F1</label>
-                                <button id="io-mode-7" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                            <div class="io-mode-box">
-                                <label>3F2</label>
-                                <button id="io-mode-8" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                        </fieldset>
-                    </div>
-<!--                    &lt;!&ndash;            <div style="height: 40%">&ndash;&gt;-->
-<!--                    &lt;!&ndash;                <span>涓滀晶PLC鎵ц鎸囦护</span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;            </div>&ndash;&gt;-->
-<!--                    &lt;!&ndash;            <div style="height: 40%">&ndash;&gt;-->
-<!--                    &lt;!&ndash;                <span>瑗夸晶PLC鎵ц鎸囦护</span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;            </div>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                    <div>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                        <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                    </div>&ndash;&gt;-->
-                </div>
                 <!-- 涓讳綋 -->
                 <div class="plc-log-body">
                     <div>
@@ -111,7 +61,7 @@
                     <table id="plc-error-table">
                         <thead>
                         <tr>
-                            <th style="width: 200px">搴忓彿</th>
+                            <th style="width: 200px">绔欑偣</th>
                             <th style="width: 400px">PLC閿欒鎻忚堪</th>
                             <th style="width: 400px">寮傚父</th>
                         </tr>
@@ -140,7 +90,9 @@
                         <th>鍏ュ簱鏍囪</th>
                         <th>绌烘澘淇″彿</th>
                         <th>鐩爣绔�</th>
-                        <th>澶у皬搴撲綅</th>
+                        <th>楂樹綆搴撲綅</th>
+                        <th>鑷姩鍑�</th>
+                        <th>鑷姩鍏�</th>
                     </tr>
                     </thead>
                     <!-- 琛ㄦ牸鍐呭 -->
@@ -329,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";
@@ -415,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