From 4fe69aa7c84b8e9d88cb7cb88865a88a4815f84c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:18:13 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 11507ba..beffbf3 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -53,27 +53,31 @@
             <!-- 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>2F</label>
-                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
-                            </div>
-                        </fieldset>
-                    </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>-->
-                </div>
+<!--                <div class="plc-log-header">-->
+<!--                    &lt;!&ndash; 璁惧浠诲姟鎿嶄綔 &ndash;&gt;-->
+<!--                    <div class="io-mode-oper">-->
+<!--                        <fieldset>-->
+<!--                            <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>-->
+<!--                            <div class="io-mode-box">-->
+<!--                                <label>F2</label>-->
+<!--                                <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!--                            </div>-->
+<!--                            <div class="io-mode-box">-->
+<!--                                <label>F4</label>-->
+<!--                                <button id="io-mode-4" 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>
@@ -110,7 +114,7 @@
                         <th>鍙嚭</th>
                         <th>鍏ュ簱鏍囪</th>
                         <th>绌烘澘淇″彿</th>
-                        <th>鐩爣绔�</th>
+                        <th>宸插畬鎴愪换鍔�</th>
                         <th>楂樹綆搴撲綅</th>
                     </tr>
                     </thead>
@@ -298,7 +302,7 @@
                         setVal(tr.children("td").eq(5), table[i-1].outEnable);
                         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);
+                        setVal(tr.children("td").eq(8), table[i-1].finishWorkNo);
                         setVal(tr.children("td").eq(9), table[i-1].locType1);
                     }
                 } else if (res.code === 403){

--
Gitblit v1.9.1