From 3fbef8c9533fea45f5ece7f8384fc8172d3fd4e2 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 17:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/webapp/views/pipeline.html | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..804c3fd 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -17,6 +17,7 @@
float: left;
width: 16%;
text-align: center;
+ margin-top: 10px;
}
.io-mode-box label {
font-weight: bolder;
@@ -52,32 +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>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>-->
-<!-- <!– <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-body">
<div>
@@ -86,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>
@@ -116,6 +91,8 @@
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
<th>楂樹綆搴撲綅</th>
+ <th>鑷姩鍑�</th>
+ <th>鑷姩鍏�</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -304,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(10), table[i-1].autoIn);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1