From 57a7240d24ce7e6e07e704a7b82916a1c8a93c9b Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 26 五月 2022 14:04:34 +0800
Subject: [PATCH] Merge branch 'klswcs2' of http://47.97.1.152:5880/r/zy-wcs into klswcs2
---
src/main/webapp/views/pipeline.html | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 487bad6..b7a54e0 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>
@@ -124,6 +125,7 @@
<script>
// 鍒濆鍖�
// 绌虹櫧琛屾暟
+ var stop = false
var plcErrorTableBlankRows = 0;
var siteTableBlankRows = 0;
// 瀹為檯琛屾暟
@@ -139,12 +141,18 @@
// 瀹炴椂璁块棶
setInterval(function () {
getPlcError();
- getSite();
+ starGetSite();
}, 1000);
setInterval(function () {
getSiteOutput();
},500);
-
+ function starGetSite() {
+ if (stop) {
+ return
+ } else {
+ getSite();
+ }
+ }
// plc寮傚父淇℃伅琛ㄨ幏鍙�
function getPlcError() {
var tableEl = $('#plc-error-table');
@@ -289,6 +297,7 @@
// 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
var layerDetl;
$(document).on('dblclick ','#site-table tr', function () {
+ stop = true
var siteId = $(this).children("td").eq(0).html();
if (siteId !== null && siteId !== "") {
layerDetl = layer.open({
@@ -314,9 +323,11 @@
$('#workNo').val("");
$('#staNo').val("");
$('#pakMk').val("");
+ stop = false
}
})
}
+
});
$(document).on('click ','#save', function () {
--
Gitblit v1.9.1