From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/projectShow.js | 75 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index a395dd8..81f3c5f 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -2,15 +2,15 @@
var index = $(".row").index(this) // 纭畾鍦ㄨ〃鏍间腑鐨勭鍑犺
var rowName = $(this).children(".projects").html() // 褰撳墠琛屼腑绫诲悕涓簆rojects鐨勭被涓殑鏂囧瓧
var project = data[index] // 鎶奷ata涓殑绗琲ndex涓」鐩� 璧嬪�肩粰project
- if(project.id==rowName){
+ if(project.projectName==rowName){
// 姣旇緝鏃堕棿
var currT = new Date() // 褰撳墠鏃堕棿
- var staT = new Date(project.startDay.substring(0,10)) // 椤圭洰寮�濮嬫椂闂�
- var endT = new Date(project.endDay.substring(0,10)) // 椤圭洰缁撴潫鏃堕棿
- var nodes = project.nodes
+ var staT = new Date(project.projectStartTime.substring(0,10)) // 椤圭洰寮�濮嬫椂闂�
+ var endT = new Date(project.projectEndTime.substring(0,10)) // 椤圭洰缁撴潫鏃堕棿
+ var nodes = project.projectPlans
// 鍒ゆ柇椤圭洰璁″垝鑺傜偣鏃堕棿鏄惁鏈夌┖鍊�
for(var i=0;i<nodes.length;i++){
- if(nodes[i].staT==''||nodes[i].endTime$==''){
+ if(nodes[i].startTime$==''||nodes[i].endTime$==''){
show = false
break
}else{
@@ -23,7 +23,7 @@
$("#tips").attr("style","display:block")
}
// 椤圭洰鍚嶇О
- $("#details h2").html(project.id)
+ $("#details h2").html(project.projectName)
// 棰勮鑺傜偣鏃堕棿
var tab = ''
var tabLeft3 = ''
@@ -32,13 +32,13 @@
var bigDays = []
for(var i = 0;i<nodes.length;i++){
- var projectsName = nodes[i].name // 鑺傜偣鍚嶇О 鏀圭涓�涓姹傜敤
+ var projectsName = nodes[i].flowId$ // 鑺傜偣鍚嶇О 鏀圭涓�涓姹傜敤
var proRET = new Date(nodes[i].realEndTime$.substring(0,10)) // 鑺傜偣瀹為檯缁撴潫鏃堕棿
var tab2 ='<tr id="td-node'+i+'-gz">'+'<tr id="td-node'+i+'-gz-2">'+'</tr>'
tab = tab +tab2
var tabLeft2 = '<tr class="tab-body">'
+'<td>'+projectsName+'</td>'
- +'<td>'+nodes[i].startTime.substring(0,10)+'</td>'
+ +'<td>'+nodes[i].startTime$.substring(0,10)+'</td>'
+'<td>'+nodes[i].endTime$.substring(0,10)+'</td>'
tabLeft3 = tabLeft3 + tabLeft2
var overtime = endT-proRET
@@ -68,9 +68,9 @@
+'</thead>'
+'<tbody>' // 琛ㄨ韩 锛堥」鐩妭鐐瑰鏈級
+'<tr class="tab-body">'
- +'<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>'
+ +'<td style="height: 40px">'+'椤圭洰鎬绘椂闀�'+'</td>'
+ +'<td style="height: 40px">'+project.projectStartTime.substring(0,10)+'</td>'
+ +'<td style="height: 40px">'+project.projectEndTime.substring(0,10)+'</td>'
+'</tr>'
var tabLeft4 = tabLeft + tabLeft3 +'</tbody>'
@@ -163,18 +163,18 @@
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:#0f9a84")
+ $("#tot-2").find("td").eq(j).attr("style","background:#8bddde")
}
}
for(var i = 0;i<nodes.length;i++){
- var proST = new Date(nodes[i].startTime.substring(0,10)) // 璁″垝寮�濮嬫棩鏈�
+ var proST = new Date(nodes[i].startTime$.substring(0,10)) // 璁″垝寮�濮嬫棩鏈�
var proET = new Date(nodes[i].endTime$.substring(0,10)) // 璁″垝缁撴潫鏃ユ湡
- var proET2 = new Date(proET.getTime()+day*2) // 璁″垝缁撴潫鏃ユ湡+2澶�
+ var proET2 = new Date(proET.getTime()-day*2) // 璁″垝缁撴潫鏃ユ湡-2澶�
var proRST =new Date(nodes[i].realStartTime$.substring(0,10)) // 瀹為檯寮�濮嬫棩鏈�
var proRET =new Date(nodes[i].realEndTime$.substring(0,10)) // 瀹為檯缁撴潫鏃ユ湡
var nodeDay = (proET-proST+day)/day // 璁″垝宸ヤ綔澶╂暟
var nodeRSDay = (proET-proRST+day)/day // 鑺傜偣瀹為檯宸ヤ綔澶╂暟
- var nodeREDay = (proRET-proST+day)/day // 棰勮寮�濮�-瀹為檯缁撴潫鏃堕棿娈�
+ var nodeREDay = (proRET-proST+day)/day // 瀹為檯缁撴潫鍑忚鍒掑紑濮嬫椂闂�
var nodeRealDay = (proRET-proRST+day)/day //瀹為檯鏃堕棿娈�
var intDay = (proST-staT)/day // 棰勮寮�濮嬫椂闂翠笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
var intRealDay = (proRST-staT)/day // 瀹為檯寮�濮嬩笌椤圭洰寮�濮嬫椂闂寸殑闂撮殧
@@ -189,18 +189,18 @@
// 涓庡綋鍓嶆椂闂寸殑鏃堕棿宸�
for(var j=0;j<nodeDay;j++){
- $(nodeId2[i]).find('td').eq(intDay+j).attr("style","background:#3597D6")
+ $(nodeId2[i]).find('td').eq(intDay+j).attr("style","background:#5998f5")
}
// 瀹為檯寮�濮嬫棩鏈熶笌瀹為檯缁撴潫鏃ユ湡閮藉～鍐� 鎸夊疄闄呮椂闂磋繘娓叉煋
if(proRST != "Invalid Date" && proRET !="Invalid Date"){
- // 瀹為檯缁撴潫鏃堕棿瓒呰繃璁″垝缁撴潫鏃堕棿 瓒呰繃鐨勬椂闂村彉绾㈣壊
+
for(var j=0;j<nodeRealDay;j++){
- if(proRET<=proET){ // 瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡
- $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
- }else if(proRET>proET && proRET<=proET2){ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡
- $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#ccc739")
+ if(proRET<=proET2){ // 瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#00cc88")
+ }else if(proRET>proET2 && proRET<=proET){ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#00cc88")
}else { // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡+2澶�
- $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#CC3333")
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#e63939")
}
}
// 瀹為檯寮�濮嬫椂闂村凡濉� 瀹為檯缁撴潫鏃堕棿鏈～ (瀹為檯缁撴潫鏃堕棿鎸夐璁＄粨鏉熸椂闂村～)鏀� 褰撳墠鏃堕棿涓庡疄闄呭紑濮嬫椂闂寸殑闂撮殧
@@ -208,25 +208,25 @@
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){
+ }else if(nodeRun>-3 && nodeRun<=0){
$(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#ccc739")
}else{
- $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#8bddde")
}
}
- // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜璁″垝鏃堕暱寰�鍓嶇Щ
+ // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜璁″垝寮�濮嬫椂闂�
}else if(proRST == "Invalid Date" && proRET !="Invalid Date"){
- if(proRET<=proET){ // 瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡
- for(var j=0;j<nodeDay;j++){ // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
- $(nodeId3[i]).find('td').eq(intNotRealStartTime+j).attr("style","background:#49C7D3") // 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
+ if(proRET<=proST){ // 瀹為檯缁撴潫鏃ユ湡<=璁″垝寮�濮嬫棩鏈� 鏆傛椂涓嶅～鍏�
+ // for(var j=0;j<nodeDay;j++){ // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
+ // $(nodeId3[i]).find('td').eq(intNotRealStartTime+j).attr("style","background:#49C7D3") // 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
+ // }
+ }else if(proRET<=proET){ //瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡
+ for(var j=0;j<nodeREDay;j++) { // 澶╂暟鏄� 瀹為檯缁撴潫鏃ユ湡-璁″垝寮�濮嬫棩鏈�
+ $(nodeId3[i]).find('td').eq(intDay + j).attr("style", "background:#00cc88")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
}
- }else if(proRET<=proET2){ //瀹為檯缁撴潫鏃ユ湡<=璁″垝缁撴潫鏃ユ湡+2澶�
- for(var j=0;j<nodeDay;j++) { // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
- $(nodeId3[i]).find('td').eq(intNotRealStartTime + j).attr("style", "background:#ccc739")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
- }
- }else{ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡+2澶�
- for(var j=0;j<nodeDay;j++) { // 澶╂暟鏄妭鐐硅鍒掑ぉ鏁�
- $(nodeId3[i]).find('td').eq(intNotRealStartTime + j).attr("style", "background:#CC3333")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
+ }else{ // 瀹為檯缁撴潫鏃ユ湡>璁″垝缁撴潫鏃ユ湡
+ for(var j=0;j<nodeREDay;j++) { // 澶╂暟鏄� 瀹為檯缁撴潫鏃ユ湡-璁″垝寮�濮嬫棩鏈�
+ $(nodeId3[i]).find('td').eq(intDay + j).attr("style", "background:#CC3333")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
}
}
// 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿鏈～
@@ -248,7 +248,10 @@
var cll = '.'+cls
$(cll).removeClass('over-color')
})
-
+ // 婊氳疆
+
+
+
--
Gitblit v1.9.1