From d250ca5d40e6b28c7f79c3d8ea724f039288dec3 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期五, 12 八月 2022 12:40:24 +0800
Subject: [PATCH] Merge branch 'hylywcs' of http://47.97.1.152:5880/r/zy-wcs into hylywcs
---
src/main/webapp/views/pipeline.html | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 56decc6..822c9d8 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -73,6 +73,7 @@
<th>鍏ュ簱鏍囪</th>
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
+ <th>楂樹綆搴撲綅</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -146,7 +147,8 @@
},500);
function starGetSite() {
if (stop) {
- return
+ getSite();
+ // return
} else {
getSite();
}
@@ -186,6 +188,7 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
+ console.log(res)
var table = res.data;
if (table.length > siteTableBlankRows && table.length !== siteTableFullRows) {
initSiteTable(table.length-siteTableBlankRows);
@@ -202,6 +205,7 @@
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(9), table[i-1].locType1);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -287,6 +291,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#site-table tbody').after(html);
--
Gitblit v1.9.1