From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/webapp/views/pipeline.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 354cc5e..009b117 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -99,11 +99,11 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>鍏ュ簱鏍囪</th>
+ <th>鍑哄叆搴撴ā寮�</th>
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
<th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>
- <th>棰勭暀</th>
+ <th>楂樹綆淇″彿</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -286,11 +286,11 @@
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].pakMk);
+ setVal(tr.children("td").eq(6), table[i-1].outInModel);
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].liftArrival);
- setVal(tr.children("td").eq(10), table[i-1].shuttleTakeEnable);
+ setVal(tr.children("td").eq(10), table[i-1].locType1);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1