From f14c2b7e852afe335290f46b9fabcc0093ae72e4 Mon Sep 17 00:00:00 2001
From: whycq0520 <91384184@qq.com>
Date: 星期四, 10 二月 2022 23:55:08 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/projectShow.js | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index 7966d34..64c7389 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -174,7 +174,7 @@
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 nodeEndTime2 = new Date(nodeEndTime.getTime()+day*2) // 璁″垝缁撴潫鏃ユ湡+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 // 璁″垝宸ヤ綔澶╂暟
@@ -183,10 +183,15 @@
var nodeRealDay = (nodeRealEndTime-nodeRealStartTime+day)/day //瀹為檯鏃堕棿娈�
var intDay = (nodeStartTime-staT)/day // 棰勮寮�濮嬫椂闂翠笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
var intRealDay = (nodeRealStartTime-staT)/day // 瀹為檯寮�濮嬩笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
+ var intRealEndDay = (nodeRealEndTime-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
+ var notRealStartDay = nodeRealEndTime-(nodeEndTime-nodeStartTime) // 鎺ㄧ畻鐨勫疄闄呭紑濮嬫棩鏈�
+ var intNotRealStartTime = (new Date(notRealStartDay)-staT)/day // 鎺ㄧ畻鐨勫紑濮嬫棩鏈熶笌椤圭洰寮�濮嬫棩鏈熺殑鏃堕棿娈�
+
+
+
// 涓庡綋鍓嶆椂闂寸殑鏃堕棿宸�
for(var j=0;j<nodeDay;j++){
$(nodeId2[i]).find('td').eq(intDay+j).attr("style","background:#3597D6")
@@ -214,32 +219,24 @@
$(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
}
}
- // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜璁″垝鏃堕暱寰�鍓嶇Щ
+ // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜璁″垝鏃堕暱寰�鍓嶇Щ
}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:#CC3333")
+ if(nodeRealEndTime<=nodeEndTime){ // 瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡
+ for(var j=0;j<nodeDay;j++){ // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
+ $(nodeId3[i]).find('td').eq(intNotRealStartTime+j).attr("style","background:#49C7D3") // 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
}
- }else if(nodeRealEndTime<=nodeEndTime && nodeRealEndTime>=nodeStartTime){
- for(var j=0;j<nodeREDay;j++){
- $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#b2e5e8")
+ }else if(nodeRealEndTime<=nodeEndTime2){ //瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡+2澶�
+ for(var j=0;j<nodeDay;j++) { // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
+ $(nodeId3[i]).find('td').eq(intNotRealStartTime + j).attr("style", "background:#ccc739")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
}
- }else{
- if(intRunDay<0){
- intRunDay = 0
- for(var j=0;j<nodeDay;j++){
- $(nodeId3[i]).find('td').eq(intRunDay+j).attr("style","background:#49C7D3")
- }
- }
- for(var j=0;j<nodeDay;j++){
- $(nodeId3[i]).find('td').eq(intRunDay+j).attr("style","background:#49C7D3")
+ }else{ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡+2澶�
+ for(var j=0;j<nodeDay;j++) { // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
+ $(nodeId3[i]).find('td').eq(intNotRealStartTime + j).attr("style", "background:#CC3333")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
}
}
// 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿鏈～
}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")
- }
+
}
}
// 榧犳爣缁忚繃
--
Gitblit v1.9.1