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 | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index 83877a6..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>'
@@ -167,7 +167,7 @@
}
}
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 proRST =new Date(nodes[i].realStartTime$.substring(0,10)) // 瀹為檯寮�濮嬫棩鏈�
--
Gitblit v1.9.1