From 17ba7be8ea897e5227bbcc051b92df08064b3dc0 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 10 二月 2022 17:05:28 +0800
Subject: [PATCH] 2-10
---
src/main/webapp/static/js/projectShow.js | 461 ++++++++++++---------------------------------------------
1 files changed, 100 insertions(+), 361 deletions(-)
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index f4f445d..7966d34 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -3,23 +3,19 @@
var rowName = $(this).children(".projects").html() // 褰撳墠琛屼腑绫诲悕涓簆rojects鐨勭被涓殑鏂囧瓧
var project = data[index] // 鎶奷ata涓殑绗琲ndex涓」鐩� 璧嬪�肩粰project
if(project.id==rowName){
-
-
-
// 姣旇緝鏃堕棿
- var currentTime = new Date() // 绯荤粺褰撳墠鏃堕棿
- var startTime = new Date(project.startDay.substring(0,10)) // 椤圭洰寮�濮嬫椂闂�
- var endTime = new Date(project.endDay.substring(0,10)) // 椤圭洰缁撴潫鏃堕棿
+ var currT = new Date() // 绯荤粺褰撳墠鏃堕棿 currentTime currT
+ var staT = new Date(project.startDay.substring(0,10)) // 椤圭洰寮�濮嬫椂闂� startTime staT
+ var endT = new Date(project.endDay.substring(0,10)) // 椤圭洰缁撴潫鏃堕棿 endTime endT
var node = project.nodes
- for(var i=0;i<node.length;i++){
- if(node[i].startTime==''||node[i].endTime$==''){
+ // 妫�娴嬮」鐩妭鐐规椂闂存槸鍚︽湁绌哄��
+ for(var i=0;i<node.length;i++){ // 寰幆椤圭洰鑺傜偣鏃堕棿
+ if(node[i].staT==''||node[i].endTime$==''){
show = false
break
}else{
show = true
}
-
-
}
if(show==true){
$("#details").attr("style","display:block")
@@ -32,17 +28,15 @@
var tab = ''
var tabLeft3 = ''
var day = 86400000
- var allDay = (endTime - startTime + day ) / day
+ var allDay = (endT - staT + day ) / day
// 棰勮鑺傜偣鐨勫ぉ鏁�,瀹為檯鑺傜偣澶╂暟,鍗犲灏戞牸瀛�;棰勮/瀹為檯 鑺傜偣涓庨」鐩紑濮嬫椂闂寸殑鏃堕棿闂撮殧锛堜粠鍝釜鏍煎瓙寮�濮嬫覆鏌擄級
- console.log(allDay)
var bigDays = []
-
for(var i = 0;i<node.length;i++){
- var nodeName = node[i].name // 鑺傜偣鍚嶇О
+ var nodeName = node[i].name // 鑺傜偣鍚嶇О 鏀圭涓�涓姹傜敤
var nodeStartTime = new Date(node[i].startTime.substring(0,10)) // 棰勮寮�濮嬫椂闂�
var nodeEndTime = new Date(node[i].endTime$.substring(0,10)) // 棰勮缁撴潫鏃堕棿
- var nodeRealStartTime =new Date(node[i].realStartTime$.substring(0,10)) // 瀹為檯寮�濮嬫椂闂�
+ var nodeRealStartTime = new Date(node[i].realStartTime$.substring(0,10)) // 瀹為檯寮�濮嬫椂闂�
var nodeRealEndTime =new Date(node[i].realEndTime$.substring(0,10)) // 瀹為檯缁撴潫鏃堕棿
var tab2 ='<tr id="td-node'+i+'-gz">'+'<tr id="td-node'+i+'-gz-2">'+'</tr>'
tab = tab +tab2
@@ -51,7 +45,7 @@
+'<td>'+node[i].startTime.substring(0,10)+'</td>'
+'<td>'+node[i].endTime$.substring(0,10)+'</td>'
tabLeft3 = tabLeft3 + tabLeft2
- var overtime = endTime-nodeRealEndTime
+ var overtime = endT-nodeRealEndTime
if(overtime<0){
bigDays.push(nodeRealEndTime)
}
@@ -64,7 +58,7 @@
'<thead>'
+'<tr id="th-gz">' + '</tr>'
+'</thead>'
- +'<tbody>'
+ +'<tbody id="tabBody">'
+'<tr id="tot">' +'</tr>'
+'<tr id="tot-2">'+'</tr>'
var tab3 = tab1+tab+'</tbody>'
@@ -78,9 +72,9 @@
+'</thead>'
+'<tbody>' // 琛ㄨ韩 锛堥」鐩妭鐐瑰鏈級
+'<tr class="tab-body">'
- +'<td style="height: 54px">'+'椤圭洰鎬绘椂闀�'+'</td>'
- +'<td style="height: 54px">'+project.startDay.substring(0,10)+'</td>'
- +'<td style="height: 54px">'+project.endDay.substring(0,10)+'</td>'
+ +'<td style="height: 50px">'+'椤圭洰鎬绘椂闀�'+'</td>'
+ +'<td style="height: 50px">'+project.startDay.substring(0,10)+'</td>'
+ +'<td style="height: 50px">'+project.endDay.substring(0,10)+'</td>'
+'</tr>'
var tabLeft4 = tabLeft + tabLeft3 +'</tbody>'
@@ -105,324 +99,58 @@
k++
}
- if(max>endTime){
- allDay = (max-startTime+day)/day
- endTime=max
- getDateArr(startTime,endTime)
+ if(max>endT){
+ allDay = (max-staT+day)/day
+ endT=max
+ getDateArr(staT,endT)
}else{
- getDateArr(startTime,endTime);
+ getDateArr(staT,endT);
}
let newDataArr = []
- if(allDay <= 40){
- let iday = allDay
- if(monthDays.length<2){
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
-
- strr = stt
- $("#th-gz").append(strr)
- }else{
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
- var gze=monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate())
- stc = '<td class="loadBox" colspan="'+gze+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- strr = stt+stc
- $("#th-gz").append(strr)
-
- for(let i=0;i<iday;i++){
- str = '<td class="loadBox-2">'+dateArr[i]+'</td>'
- $("#tot").append(str);
- // $(".loadBox").attr('style','width:50px')
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
+ var strr =''
+ // 骞翠唤
+ if(monthDays.length<2){ // 涓�涓湀
+ var gz=monthDays[0]-staT.getDate()+1 // 褰撳墠鏈堜唤鍓╀綑澶╂暟
+ stt = '<th class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</th>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
+ $("#th-gz").append(stt)
+ }else if (monthDays.length<3){ // 涓や釜鏈�
+ var gz=monthDays[0]-staT.getDate()+1// 褰撳墠鏈堜唤鍓╀綑澶╂暟
+ stt = '<th class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</th>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
+ var gz2 = monthDays[1]-(monthDays[1]-endT.getDate()) // 鍓╀綑鐨勫ぉ鏁�=褰撴湀澶╂暟-锛堝綋鏈堝ぉ鏁�-缁撴潫鏃ユ湡锛�
+ stt2 = '<th class="loadBox" colspan="'+gz2+'">'+newMonthArr[1]+'</th>'
+ strr =stt +stt2
+ $("#th-gz").append(strr)
+ }else { // 涓変釜鏈堝強浠ヤ笂
+ var gz=monthDays[0]-staT.getDate()+1// 褰撳墠鏈堜唤鍓╀綑澶╂暟
+ stt = '<th class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</th>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
+ var gz2 = monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endT.getDate()) // 鍓╀綑鐨勫ぉ鏁�=褰撴湀澶╂暟-锛堝綋鏈堝ぉ鏁�-缁撴潫鏃ユ湡锛�
+ stt2 = '<th class="loadBox" colspan="'+gz2+'">'+newMonthArr[newMonthArr.length-1]+'</th>'
+ // 鍘婚櫎绗竴涓湀 鍜屾渶鍚庝竴涓湀
+ monthDays.shift()
+ monthDays.pop()
+ newMonthArr.shift()
+ newMonthArr.pop()
+ var std = ''
+ for (var j=0;j<monthDays.length;j++){
+ stt3 = '<th class="loadBox" colspan="'+monthDays[j]+'">'+newMonthArr[j]+'</th>'
+ std = std + stt3
}
-
- }else if(allDay>40 && allDay<=80){
- let iday = Math.ceil(allDay / 2 )
- for(var m=0;m<monthDays.length-1;m++){
- var gzd=monthDays[m]
- std = '<td class="loadBox" colspan="'+gzd+'">'+newMonthArr[m]+'</td>'
+ strr = stt + std +stt2
+ $("#th-gz").append(strr)
+ }
+ // 椤圭洰鏃堕棿鍗曞厓鏍�
+ for(let i=0;i<allDay;i++){
+ str = '<td class="loadBox-2">'+dateArr[i]+'</td>'
+ $("#tot").append(str);
+ // $(".loadBox").attr('style','width:50px')
+ }
+ // 鑺傜偣鏃堕棿鍗曞厓鏍�
+ for (let j=0;j<allDay;j++){
+ tds = '<td class="gz-color">'+'</td>'
+ for(let k in nodeId){
+ $(nodeId[k]).append(tds)
}
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
- var gze=monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate())
- stc = '<td class="loadBox" colspan="'+gze+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- strr = stt+std+stc
- $("#th-gz").append(strr)
- for(let k=0;k<dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k++
- }
- for(let i=0;i<iday;i++){
- str = '<td class="loadBox-2" colspan="2">'+newDataArr[i]+'</td>'
- $("#tot").append(str);
- // $(".loadBox").attr('style','width:50px')
- }
- allDays = allDay%2
- if(allDays==1){
- allDay = allDay+1
- }else {
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }else if(allDay>80 && allDay<=120){
- let iday = Math.ceil(allDay / 3 )
- var num = 1
- var ste = null
- for(var m=0;m<monthDays.length-2;m++){
- var gzd=monthDays[m+1]
-
- std = '<td class="loadBox" colspan="'+gzd+'">'+newMonthArr[num]+'</td>'
- ste=ste+std
- num++
- }
-
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
- var gze=monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate())
- stc = '<td class="loadBox" colspan="'+gze+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- strr = stt+ste+stc
- $("#th-gz").append(strr)
- for(let k=0;k<=dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k=k+2
- }
- for(let i=0;i<iday;i++){
- // 鍥哄畾琛�
- str = '<td class="loadBox-2" colspan="3">'+newDataArr[i]+'</td>'
- $("#tot").append(str);
- // $(".loadBox").attr('style','width:10px;padding:0px')
- }
- allDays = allDay%3
- if(allDays==1){
- allDay = allDay+2
- }else if(allDays==2){
- allDay = allDay+1
- }else{
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }else if(allDay>120 && allDay<=160){
- let iday = Math.ceil(allDay / 4 )
- var num = 1
- var ste = null
- for(var m=0;m<monthDays.length-2;m++){
- var gzd=monthDays[m+1]
- std = '<td class="loadBox" colspan="'+gzd+'">'+newMonthArr[num]+'</td>'
- ste=ste+std
- num++
- }
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
- var gze=monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate())
- stc = '<td class="loadBox" colspan="'+gze+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- strr = stt+ste+stc
- $("#th-gz").append(strr)
- for(let k=0;k<=dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k=k+3
- }
- for(let i=0;i<iday;i++){
- str = '<td class="loadBox-2" colspan="4">'+newDataArr[i]+'</td>'
- $("#tot").append(str);
- }
- allDays = allDay%4
- if(allDays==1){
- allDay = allDay+3
- }else if(allDays==2){
- allDay = allDay+2
- }else if(allDays==3){
- allDay = allDay+1
- }else{
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }else if(allDay>160 && allDay<=200){
- let iday = Math.ceil(allDay / 5 )
- var num = 1
- var ste = null
- for(var m=0;m<monthDays.length-2;m++){
- var gzd=monthDays[m+1]
-
- std = '<td class="loadBox" colspan="'+gzd+'">'+newMonthArr[num]+'</td>'
- ste=ste+std
- num++
- }
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
- var gze=monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate())
- stc = '<td class="loadBox" colspan="'+gze+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- strr = stt+ste+stc
- $("#th-gz").append(strr)
- for(let k=0;k<=dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k=k+4
- }
- for(let i=0;i<iday;i++){
- // 鍥哄畾琛�
- str = '<td class="loadBox-2" colspan="5">'+newDataArr[i]+'</td>'
- $("#tot").append(str);
- }
- allDays = allDay%5
- if(allDays==1){
- allDay = allDay+4
- }else if(allDays==2){
- allDay = allDay+3
- }else if(allDays==3){
- allDay = allDay+2
- }else if(allDays==4){
- allDay = allDay+1
- }else{
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }else if(allDay>200 && allDay<=240){
- let iday = Math.ceil(allDay / 6 )
- var num = 1
- var ste = null
- for(var m=0;m<monthDays.length-2;m++){
- var gzd=monthDays[m+1]
- std = '<td class="loadBox" colspan="'+gzd+'">'+newMonthArr[num]+'</td>'
- ste=ste+std
- num++
- }
- var gz=monthDays[0]-startTime.getDate()+1
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>'
- var gze=monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate())
- stc = '<td class="loadBox" colspan="'+gze+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- strr = stt+ste+stc
- $("#th-gz").append(strr)
- for(let k=0;k<=dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k=k+5
- }
- for(let i=0;i<iday;i++){
- // 鍥哄畾琛�
- str = '<td class="loadBox-2" colspan="6">'+newDataArr[i]+'</td>'
- $("#tot").append(str);
- }
- allDays = allDay%6
- if(allDays==1){
- allDay = allDay+5
- }else if(allDays==2){
- allDay = allDay+4
- }else if(allDays==3){
- allDay = allDay+3
- }else if(allDays==4){
- allDay = allDay+2
- }else if(allDays==5){
- allDay = allDay+1
- }else{
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }else if(allDay>240){
- let iday = Math.ceil(allDay / 7 )
- for(let k=0;k<=dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k=k+6
- }
- for(let i=0;i<iday;i++){
- // 鍥哄畾琛�
- str = '<td class="loadBox" colspan="7">'+newDataArr[i]+'</td>'
- $("#th-gz").append(str);
- }
- allDays = allDay%7
- if(allDays==1){
- allDay = allDay+6
- }else if(allDays==2){
- allDay = allDay+5
- }else if(allDays==3){
- allDay = allDay+4
- }else if(allDays==4){
- allDay = allDay+3
- }else if(allDays==5){
- allDay = allDay+2
- }else if(allDays==6){
- allDay = allDay+1
- }else{
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }else if(allDay>280){
- let iday = Math.ceil(allDay / 8 )
- for(let k=0;k<=dateArr.length;k++){
- var newDays = dateArr[k]
- newDataArr.push(newDays)
- k=k+7
- }
- for(let i=0;i<iday;i++){
- // 鍥哄畾琛�
- str = '<td class="loadBox-2" colspan="8">'+newDataArr[i]+'</td>'
- $("#th-gz").append(str);
- }
- allDays = allDay%8
- if(allDays==1){
- allDay = allDay+7
- }else if(allDays==2){
- allDay = allDay+6
- }else if(allDays==3){
- allDay = allDay+5
- }else if(allDays==4){
- allDay = allDay+4
- }else if(allDays==5){
- allDay = allDay+3
- }else if(allDays==6){
- allDay = allDay+2
- }else if(allDays==7){
- allDay = allDay+1
- }else{
- allDay = allDay
- }
- for (let j=0;j<allDay;j++){
- tds = '<td class="gz-color">'+'</td>'
- for(let k in nodeId){
- $(nodeId[k]).append(tds)
- }
- }
- }
- // 123
+ }
var nodeId2 = [],nodeId3 = []
for(let k = 0;k<node.length;k++){
var getId2 = "#"+"td-node"+k+"-gz"
@@ -436,57 +164,65 @@
// for(var j = 0;j < allDay;j++){
// $("#tot").find("td").eq(j+3).attr("style","background:#3597D6")
// }
- var runDay = Math.ceil((currentTime - startTime)/ day)
+ var runDay = Math.ceil((currT - staT)/ day)
if(runDay>0){
for(var j = 0;j < runDay;j++){
- $("#tot-2").find("td").eq(j).attr("style","background:#49C7D3")
+ $("#tot-2").find("td").eq(j).attr("style","background:#0f9a84")
}
}
for(var i = 0;i<node.length;i++){
- var nodeName = node[i].name // 鑺傜偣鍚嶇О
- var nodeStartTime = new Date(node[i].startTime.substring(0,10)) // 棰勮寮�濮嬫椂闂�
- var nodeEndTime = new Date(node[i].endTime$.substring(0,10)) // 棰勮缁撴潫鏃堕棿
- var nodeRealStartTime =new Date(node[i].realStartTime$.substring(0,10)) // 瀹為檯寮�濮嬫椂闂�
- var nodeRealEndTime =new Date(node[i].realEndTime$.substring(0,10)) // 瀹為檯缁撴潫鏃堕棿
- var nodeDay = (nodeEndTime-nodeStartTime+day)/day // 棰勮寮�濮�-棰勮缁撴潫鏃堕棿娈�
- var nodeRSDay = (nodeEndTime-nodeRealStartTime+day)/day // 瀹為檯寮�濮�-棰勮缁撴潫鏃堕棿娈�
- var nodeREDay = (nodeRealEndTime-nodeStartTime+day)/day // 棰勮寮�濮�-瀹為檯缁撴潫鏃堕棿娈�
+ var nodeName = node[i].name // 鑺傜偣
+ var nodeStartTime = new Date(node[i].startTime.substring(0,10)) // 璁″垝寮�濮嬫棩鏈�
+ var nodeEndTime = new Date(node[i].endTime$.substring(0,10)) // 璁″垝缁撴潫鏃ユ湡
+ var nodeEndTime2 = new Date(nodeEndTime.getTime()+day*2)
+ var nodeRealStartTime =new Date(node[i].realStartTime$.substring(0,10)) // 瀹為檯寮�濮嬫棩鏈�
+ var nodeRealEndTime =new Date(node[i].realEndTime$.substring(0,10)) // 瀹為檯缁撴潫鏃ユ湡
+ var nodeDay = (nodeEndTime-nodeStartTime+day)/day // 璁″垝宸ヤ綔澶╂暟
+ var nodeRSDay = (nodeEndTime-nodeRealStartTime+day)/day // 鑺傜偣瀹為檯宸ヤ綔澶╂暟
+ var nodeREDay = (nodeRealEndTime-nodeStartTime+day)/day // 棰勮寮�濮�-瀹為檯缁撴潫鏃堕棿娈�
var nodeRealDay = (nodeRealEndTime-nodeRealStartTime+day)/day //瀹為檯鏃堕棿娈�
- var intDay = (nodeStartTime-startTime)/day // 棰勮寮�濮嬫椂闂翠笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
- var intRealDay = (nodeRealStartTime-startTime)/day // 瀹為檯寮�濮嬩笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
- var nodeRunDay = Math.ceil((currentTime-nodeStartTime)/ day)
- var nodeRealRunDay = Math.ceil((currentTime-nodeRealStartTime)/ day)
- var nodeRun = Math.ceil((currentTime-nodeEndTime-day)/ day)
+ var intDay = (nodeStartTime-staT)/day // 棰勮寮�濮嬫椂闂翠笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
+ var intRealDay = (nodeRealStartTime-staT)/day // 瀹為檯寮�濮嬩笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
+ var nodeRunDay = Math.ceil((currT-nodeStartTime)/ day)
+ var nodeRealRunDay = Math.ceil((currT-nodeRealStartTime)/ day)
+ var nodeRun = Math.ceil((currT-nodeEndTime-day)/ day)
var intRunDay = nodeRealEndTime-(nodeRealEndTime-(nodeEndTime-nodeStartTime))/day
// 涓庡綋鍓嶆椂闂寸殑鏃堕棿宸�
for(var j=0;j<nodeDay;j++){
$(nodeId2[i]).find('td').eq(intDay+j).attr("style","background:#3597D6")
}
- // 瀹為檯寮�濮嬫椂闂翠笌缁撴潫鏃堕棿閮藉～鍐� 鎸夊疄闄呮椂闂磋繘娓叉煋
- if(nodeRealStartTime != "Invalid Date" && nodeRealEndTime !="Invalid Date"){
+ // 瀹為檯寮�濮嬫棩鏈熶笌瀹為檯缁撴潫鏃ユ湡閮藉～鍐� 鎸夊疄闄呮椂闂磋繘娓叉煋
+ if(nodeRealStartTime != "Invalid Date" && nodeRealEndTime !="Invalid Date"){
+ // 瀹為檯缁撴潫鏃堕棿瓒呰繃璁″垝缁撴潫鏃堕棿 瓒呰繃鐨勬椂闂村彉绾㈣壊
for(var j=0;j<nodeRealDay;j++){
- $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
+ if(nodeRealEndTime<=nodeEndTime){ // 瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
+ }else if(nodeRealEndTime>nodeEndTime && nodeRealEndTime<=nodeEndTime2){ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#ccc739")
+ }else { // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡+2澶�
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#CC3333")
+ }
}
- // 瀹為檯寮�濮嬫椂闂村凡濉� 瀹為檯缁撴潫鏃堕棿鏈～ 瀹為檯缁撴潫鏃堕棿鎸夐璁＄粨鏉熸椂闂村～
- }else if(nodeRealStartTime != "Invalid Date" && nodeRealEndTime =="Invalid Date"){
+ // 瀹為檯寮�濮嬫椂闂村凡濉� 瀹為檯缁撴潫鏃堕棿鏈～ (瀹為檯缁撴潫鏃堕棿鎸夐璁＄粨鏉熸椂闂村～)鏀� 褰撳墠鏃堕棿涓庡疄闄呭紑濮嬫椂闂寸殑闂撮殧
+ }else if(nodeRealStartTime != "Invalid Date" && nodeRealEndTime =="Invalid Date"){
for(var j=0;j<nodeRealRunDay;j++){
if(nodeRun>0){
$(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#CC3333")
}else if(nodeRun>-2 && nodeRun<=0){
- $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#CC9933")
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#ccc739")
}else{
$(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
}
}
- // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜棰勮寮�濮嬫椂闂村～
- }else if(nodeRealStartTime == "Invalid Date" && nodeRealEndTime !="Invalid Date"){
- if(nodeEndTime<nodeRealEndTime){
+ // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜璁″垝鏃堕暱寰�鍓嶇Щ
+ }else if(nodeRealStartTime == "Invalid Date" && nodeRealEndTime !="Invalid Date"){
+ if(nodeRealEndTime>nodeEndTime){ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡
for(var j=0;j<nodeREDay;j++){
- $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
+ $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#CC3333")
}
- }else if(nodeEndTime>=nodeRealEndTime && nodeRealEndTime>=nodeStartTime){
+ }else if(nodeRealEndTime<=nodeEndTime && nodeRealEndTime>=nodeStartTime){
for(var j=0;j<nodeREDay;j++){
- $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
+ $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#b2e5e8")
}
}else{
if(intRunDay<0){
@@ -500,12 +236,15 @@
}
}
// 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿鏈～
- }else if(nodeRealStartTime == "Invalid Date" && nodeRealEndTime =="Invalid Date"){
+ }else if(nodeRealStartTime == "Invalid Date" && nodeRealEndTime =="Invalid Date"){
for(var j=0;j<nodeDay;j++){
$(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
}
}
}
+ // 榧犳爣缁忚繃
+ // $("#tabBody").find("tr").eq(3).find("td").eq(30).attr("style","background:#354352")
+ // $("#tabBody").find("td").eq(30).attr("style","background:#f60313")
function getDateArr(start,end) {
let option = new Date(start) // 寮�濮嬫椂闂�
let nowDate = new Date(end) // 缁撴潫鏃堕棿
--
Gitblit v1.9.1