From 308c398b62c2319a78f7d9dae6aea8916da95cab Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 10 二月 2022 10:42:31 +0800
Subject: [PATCH] #table-body-node

---
 src/main/webapp/static/js/tableData.js |   86 ++++++++++++++++++++++--------------------
 1 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 5683f92..eab15a0 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -54,26 +54,29 @@
 					}
 					// 琛ㄨ韩濉厖
 					$('#tab-body').empty()
-					$.each(data,function(i,data){
-						str = '<tr class="row">'
-								+'<th class="projects">'+data.id+'</th>'
-								+'<td class="nor-mal">'+data.startDay.substring(0,10)+'</td>'
-								+'<td class="nor-mal">'+data.endDay.substring(0,10)+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[0].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[0].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[1].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[1].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[2].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[2].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[3].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[3].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[4].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[4].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[5].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[5].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[6].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[6].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[7].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[7].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[8].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[8].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[9].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[9].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[10].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[10].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'<td class="normal">'+'<p>'+data.nodes[11].endTime$.substring(0,10)+'</p>'+'<p>'+data.nodes[11].realEndTime$.substring(0,10)+'</p>'+'</td>'
-								+'</tr>'
-						$('#tab-body').append(str)
-					})
+					for(var i = 0;i<data.length;i++){
+						var node = data[i].nodes
+						for(var j = 0;j<node.length;j++){
+							var dataNull = node[j]
+							for(var k in dataNull){
+								dataNull[k] = dataNull[k] === null ? "" : dataNull[k]
+							}
+						}
+						str = ''
+						for(var j=0;j<node.length;j++){
+							var nodeName = node[j].flowId$ // 鑺傜偣鍚嶇О
+							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>'
+							str=str+str1
+						}
+						var str2 = '<tr id="row'+i+'" class="row">'
+							+'<th class="projects">'+data[i].id+'</th>'
+							+'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
+							+'<td class="nor-mal">'+data[i].endDay.substring(0,10)+'</td>'
+						var str3 =  str2 +str +'</tr>'
+						$('#tab-body').append(str3)
+					}
 					var dataLen = data.length
 					for(var t = 0;t < dataLen; t++){
 						var nodes = data[t].nodes
@@ -89,35 +92,36 @@
 							// 鍒ゆ柇realEndTime$.substring(0,10) 鏄惁涓虹┖
 							if(realEndTime$ === ""){
 								// 璁″垝鏃ユ湡涓庣郴缁熸棩鏈熸瘮杈�
-									var ExDay = eDay.getTime()-myDate.getTime()
-								
-									if(ExDay>-86400000 && ExDay<172800000){
-										$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC9933");
-										
-									}else if(ExDay<-86400000){
-										$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
-										
-									}else if(ExDay>172800000){
-										$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#2e4e7e")	
-									}
+								var ExDay = eDay.getTime()-myDate.getTime()
+
+								if(ExDay>-86400000 && ExDay<172800000){
+									$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC9933");
+
+								}else if(ExDay<-86400000){
+									$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
+
+								}else if(ExDay>172800000){
+									$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#2e4e7e")
+								}
 							}else{
 								function tab(date1,date2){
-								    var oDate1 = new Date(date1);
-								    var oDate2 = new Date(date2);
+									var oDate1 = new Date(date1);
+									var oDate2 = new Date(date2);
 									var x = oDate1.getTime()-oDate2.getTime()
-								    if(x>=0){
-											$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#009966")
-								      
-								    } else {
-											$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
-											
-								    }
+									if(x>=0){
+										$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#009966")
+
+									} else {
+										$("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
+
+									}
 								}
 								tab(endTime$,realEndTime$,);
 							}
-							
+
 						}
 					}
+
 				}
 				
 			}

--
Gitblit v1.9.1