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 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 4ed983e..804c3fd 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -61,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>
@@ -91,6 +91,8 @@
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
<th>楂樹綆搴撲綅</th>
+ <th>鑷姩鍑�</th>
+ <th>鑷姩鍏�</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -279,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