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/tableData3.js | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/tableData3.js b/src/main/webapp/static/js/tableData3.js
index b5cabc2..48187ad 100644
--- a/src/main/webapp/static/js/tableData3.js
+++ b/src/main/webapp/static/js/tableData3.js
@@ -3,9 +3,9 @@
getThbodyData()
getType()
}, 0)
-setInterval(function () {
- getThbodyData()
-}, 5000)
+//setInterval(function () {
+// //getThbodyData()
+//}, 5000)
//琛ㄥご灏忚繘搴﹁〃
var getType = function () {
@@ -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>'
@@ -76,16 +76,56 @@
/*****************************************************************************************************************************************************************************/
var getThbodyData = function () {
$.ajax({
- url: baseurl + '/pms/projectPlan/toFront/common',
+ url: baseurl + '/pms/projectPlan/toFront/asrs',
type: 'GET',
dataType: 'JSON',
data: {},
success: function (res) {
if (res.code == 200) {
- console.log(res)
data = res.data
+ switch (data.length) {
+ case 0:
+ $("#emptyDiv").attr("style", "height:608px")
+ break;
+ case 1:
+ $("#emptyDiv").attr("style", "height:557px")
+ break;
+ case 2:
+ $("#emptyDiv").attr("style", "height:506px")
+ break;
+ case 3:
+ $("#emptyDiv").attr("style", "height:455px")
+ break;
+ case 4:
+ $("#emptyDiv").attr("style", "height:404px")
+ break;
+ case 5:
+ $("#emptyDiv").attr("style", "height:353px")
+ break;
+ case 6:
+ $("#emptyDiv").attr("style", "height:302px")
+ break;
+ case 7:
+ $("#emptyDiv").attr("style", "height:251px")
+ break;
+ case 8:
+ $("#emptyDiv").attr("style", "height:200px")
+ break;
+ case 9:
+ $("#emptyDiv").attr("style", "height:150px")
+ break;
+ case 10:
+ $("#emptyDiv").attr("style", "height:100px")
+ break;
+ case 11:
+ $("#emptyDiv").attr("style", "height:49px")
+ break;
+ default:
+ $("#emptyDiv").attr("style", "height:80px")
+ }
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for (var i = 0; i < data.length; i++) {
+ console.log(data.length)
var dataNode = data[i].projectPlans
for (var j = 0; j < dataNode.length; j++) {
var dataNull = dataNode[j]
@@ -111,10 +151,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