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 | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 0e2085f..822c9d8 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -59,9 +59,10 @@
<!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
<div id="site-monitor" class="main-board">
<!-- 琛ㄦ牸 -->
- <table id="site-table">
+ <!--鍥哄畾琛ㄥご table 鍔爐able-layout: fixed; th 鍔� position:sticky;top: 0;-->
+ <table id="site-table" style="table-layout: fixed;">
<!-- 琛ㄥご -->
- <thead>
+ <thead style="position:sticky;top: 0;">
<tr>
<th>绔欏彿</th>
<th>宸ヤ綔鍙�</th>
@@ -72,6 +73,7 @@
<th>鍏ュ簱鏍囪</th>
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
+ <th>楂樹綆搴撲綅</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -118,8 +120,6 @@
</div>
</div>
-
-
</body>
<script>
// 鍒濆鍖�
@@ -147,7 +147,8 @@
},500);
function starGetSite() {
if (stop) {
- return
+ getSite();
+ // return
} else {
getSite();
}
@@ -187,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);
@@ -203,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";
@@ -288,6 +291,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#site-table tbody').after(html);
@@ -296,7 +300,7 @@
// 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
var layerDetl;
$(document).on('dblclick ','#site-table tr', function () {
- stop = false
+ stop = true
var siteId = $(this).children("td").eq(0).html();
if (siteId !== null && siteId !== "") {
layerDetl = layer.open({
@@ -322,10 +326,11 @@
$('#workNo').val("");
$('#staNo').val("");
$('#pakMk').val("");
+ stop = false
}
})
}
- stop = true
+
});
$(document).on('click ','#save', function () {
--
Gitblit v1.9.1