From 03b41fa7164bb7dc5a8bd17a06cfceed43e65617 Mon Sep 17 00:00:00 2001
From: whycq0520 <91384184@qq.com>
Date: 星期四, 24 三月 2022 12:56:44 +0800
Subject: [PATCH] # ycq
---
src/main/webapp/static/js/tableData.js | 178 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 94 insertions(+), 84 deletions(-)
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 89f5c13..e08c097 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -1,50 +1,55 @@
-setTimeout(function(){
- getTheaddData()
-
-},500)
-setInterval(function(){
-
- getThbodyData()
-
-},500)
-
- var proData = ["椤圭洰鍚嶇О","寮�濮嬫椂闂�","缁撴潫鏃堕棿",]
+ setTimeout(function(){
+ getTheaddData()
+ getThbodyData()
+ },0)
+ setInterval(function(){
+ getThbodyData()
+ },5000)
+
+
+ var proData = ["椤圭洰鍚嶇О","鍞墠閲戦鏍哥畻","寮�濮嬫椂闂�","缁撴潫鏃堕棿",
+ "鍚堢害绛捐","鍥鹃潰浼氱","BOM璁捐/浜岀骇BOM涓嬪彂",
+ "鏉愭枡閲囪喘","鐢熶骇鍒朵綔","鍐呴儴瀹夎璋冩暣锛堢爺鍙戠墿鏂欙級","杩涘満瀹夎","绋嬪簭璋冭瘯","绯荤粺鑱旇皟","涓婄嚎杩愯","椤圭洰楠屾敹","杩愯垂"]
var getTheaddData = function(){
+ for (var i = 0;i < proData.length; i++) {
+ var str = "<th class='xiangmu'>"+proData[i]+"</th>"
+ $("#tab-header").append(str)
+ }
+
+ // $.ajax({
+ // url:baseurl+'/pms/projectPlan/flowStatus',
+ // type:'GET',
+ // dataType:'JSON',
+ // data:{},
+ // success:function(res){
+ // if(res.code==200){
+ // data=res.data
+ // var headStr = []
+ // for(var i = 0;i<data.length;i++){
+ // headStr.push(data[i].name)
+ // }
+ // proData = proData.concat(headStr)
+ // // 琛ㄥご
+ // for(var i = 0;i<proData.length;i++){
+ // var str = "<th class='xiangmu'>"+proData[i]+"</th>"
+ // $("#tab-header").append(str)
+ // }
+ // }
+ // },
+ // })
+ }
+
+/*****************************************************************************************************************************************************************************/
+ var getThbodyData = function(){
$.ajax({
- url:baseUrl + '/projectPlan/flowStatus',
+ url:baseurl+'/pms/projectPlan/toFront',
type:'GET',
dataType:'JSON',
data:{},
success:function(res){
+ console.log(res)
if(res.code==200){
data=res.data
- var headStr = []
- for(var i = 0;i<data.length;i++){
- headStr.push(data[i].name)
- }
- proData = proData.concat(headStr)
- // 琛ㄥご
- for(var i = 0;i<proData.length;i++){
- var str = "<th class='xiangmu'>"+proData[i]+"</th>"
- $("#tab-header").append(str)
- }
- }
- },
- })
- }
-
-
-
- var getThbodyData = function(){
- $.ajax({
- url:baseUrl+'/projectPlan/toFront',
- type:'GET',
- dataType:'JSON',
- data:{},
- success:function(res){
- if(res.code==200){
- data=res.data
-
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for(var i = 0;i<data.length;i++){
var dataNode = data[i].nodes
@@ -57,26 +62,30 @@
}
// 琛ㄨ韩濉厖
$('#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].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
@@ -86,47 +95,48 @@
var realEndTime$ = data[t].nodes[k].realEndTime$.substring(0,10)
// 椤圭洰鑺傜偣璁″垝缁撴潫鏃堕棿
var endTime$ = data[t].nodes[k].endTime$.substring(0,10)
-
var myDate = new Date()
var nowDay = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate()
var eDay = new Date(endTime$)
// 鍒ゆ柇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