From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/pipeline.html | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 8ab209f..2ec313f 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -73,13 +73,12 @@
</div>
</fieldset>
</div>
-
- <div>
- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
- </div>
</div>
<!-- 涓讳綋 -->
<div class="plc-log-body">
+ <div>
+ <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
+ </div>
<table id="plc-error-table">
<thead>
<tr>
@@ -227,7 +226,7 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
- layer.msg(res.msg, {icon: 1})
+ layer.msg("鎿嶄綔鎴愬姛锛岃鑰愬績绛夊緟涓�鍒嗛挓", {icon: 1})
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
@@ -285,16 +284,57 @@
siteTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
+ var current = table[i-1]
var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].devNo);
- setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].autoing);
- 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(7), table[i-1].emptyMk);
- setVal(tr.children("td").eq(8), table[i-1].staNo);
+ var devNo = current.devNo, autoing = current.autoing,workNo = current.workNo,
+ loading = current.loading,inEnable = current.inEnable,outEnable = current.outEnable,
+ emptyMk = current.emptyMk,pakMk = current.pakMk,staNo = current.staNo;
+ if (autoing === "N") {
+ tr.children("td").eq(2).css("background-color","#c8c9cc").css("color","white")
+ }
+ // 鍏ュ簱绔欑偣鍒ゆ柇
+ if (devNo === 103 || devNo === 203) {
+ // 鍒ゆ柇鏄惁鑷姩涓旀湁鐗�
+ if (autoing === "Y" && loading === "Y") {
+ // 鍒ゆ柇褰撳墠宸ヤ綔鍙锋槸鍚︿负婊℃墭鍏ュ簱浠诲姟
+ if (workNo === 9996) {
+ if (emptyMk === "Y") {
+ tr.children("td").eq(7).css("background-color","#fab6b6").css("color","white")
+ }
+ if (inEnable === "N") {
+ tr.children("td").eq(4).css("background-color","#fab6b6").css("color","white")
+ }
+ if (pakMk === "N") {
+ tr.children("td").eq(6).css("background-color","#fab6b6").css("color","white")
+ }
+ }
+ }
+ }
+ // 鍫嗗灈鏈哄嚭搴撶珯鐐瑰垽鏂�
+ if (devNo === 104 || devNo === 108 || devNo === 204 || devNo === 208) {
+ if (autoing === "Y") {
+ if (outEnable === "N") {
+ // tr.children("td").eq(5).css("background-color","#fab6b6").css("color","white")
+ }
+ }
+ }
+ // 鍫嗗灈鏈哄叆搴撶珯鐐瑰垽鏂�
+ if (devNo === 107 || devNo === 111 || devNo === 211 || devNo === 207) {
+ if (autoing === "Y") {
+ if (inEnable === "N") {
+ // tr.children("td").eq(4).css("background-color","#fab6b6").css("color","white")
+ }
+ }
+ }
+ setVal(tr.children("td").eq(0), devNo);
+ setVal(tr.children("td").eq(1), workNo);
+ setVal(tr.children("td").eq(2), autoing);
+ setVal(tr.children("td").eq(3), loading);
+ setVal(tr.children("td").eq(4), inEnable);
+ setVal(tr.children("td").eq(5), outEnable);
+ setVal(tr.children("td").eq(6), pakMk);
+ setVal(tr.children("td").eq(7), emptyMk);
+ setVal(tr.children("td").eq(8), staNo);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1