From 3536050491417982763e2f2f9d7c0d9982e16360 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 13 九月 2022 16:30:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/tableData2.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index 9b0a439..43c2845 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -16,9 +16,9 @@
success: function (res) {
if (res.code === 200) {
var str = '<tr>'
- + '<th>' + '椤圭洰鎬绘暟' + '</th>' + '<th>' + res.data.totalQuantity + '</th>'
- + '<th>' + '闆嗘垚椤圭洰' + '</th>' + '<th>' + res.data.intoSum + '</th>'
- + '<th>' + '闈為泦鎴愰」鐩暟' + '</th>' + '<th>' + res.data.wrongInto + '</th>'
+ //+ '<th>' + '椤圭洰鎬绘暟' + '</th>' + '<th>' + res.data.totalQuantity + '</th>'
+ //+ '<th>' + '闆嗘垚椤圭洰' + '</th>' + '<th>' + res.data.intoSum + '</th>'
+ + '<th>' + '甯歌椤圭洰鏁�' + '</th>' + '<th>' + res.data.wrongInto + '</th>'
+ '<th>' + '宸查獙鏀堕」鐩暟' + '</th>' + '<th>' + res.data.inspected + '</th>'
+ '<th>' + '鏈獙鏀堕」鐩暟' + '</th>' + '<th>' + res.data.wrongInspected + '</th>'
+ '<th>' + '宸插畬宸ユ湭楠屾敹鏁�' + '</th>' + '<th>' + res.data.finished + '</th>'
@@ -111,10 +111,11 @@
}
str = ''
for (var j = 0; j < node.length; j++) {
- var nodeName = node[j].flowId$ // 鑺傜偣鍚嶇О
+ var weightNum = node[j].weightNum
+ var itemId = node[j].itemId
var nodeEndTime = node[j].endTime$.substring(0, 10)
var nodeRealStartTime = node[j].realEndTime$.substring(0, 10)
- str1 = '<td class="normal">' + '<p>' + nodeEndTime + '</p>' + '<p>' + nodeRealStartTime + '</p>' + '</td>'
+ str1 = '<td class="normal" id="item-'+ itemId + '-' + weightNum +'">' + '<p>' + nodeEndTime + '</p>' + '<p>' + nodeRealStartTime + '</p>' + '</td>'
str = str + str1
}
var str2 = '<tr id="row' + i + '" class="row">'
--
Gitblit v1.9.1