From 44858ee0b87e8e0ac321bae65233523ec43c3bc7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 14:59:54 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/projectShow.js | 8 ++++----
src/main/webapp/static/css/style.css | 3 +--
src/main/webapp/static/js/tableData2.js | 41 ++++++++++++++++++++++-------------------
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index f1f23fa..8940b29 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -7,8 +7,7 @@
}
/* 鐢诲竷 */
#root {
- /*height: 100%;*/
- min-height:100%;
+ height: 100%;
width: 100%;
margin: 0;
background-color: /* #2C3E50 */ #2e4e7e;
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index b0a4f41..81f3c5f 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -10,7 +10,7 @@
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 = ''
@@ -38,7 +38,7 @@
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
@@ -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)) // 瀹為檯寮�濮嬫棩鏈�
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index f518940..e9a6568 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -143,7 +143,7 @@
data: {},
success: function (res) {
if (res.code == 200) {
- console.log(res)
+ console.log(res)
data = res.data
//data = resMap
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
@@ -190,28 +190,28 @@
str9 = ''
var str3 = str2 + str + str9 + '</tr>'
$('#tab-body').append(str3)
- var deAmt = data[i].plandeAmt - data[i].realdeAmt
- if (deAmt < 0) {
- $("#tab-body").find('tr').eq(i).find("td").eq(14).attr("style", "background:#CC3333");
- } else {
- $("#tab-body").find('tr').eq(i).find("td").eq(14).attr("style", "background:#009966");
- }
- var inAmt = data[i].planinAmt - data[i].realinAmt
- if (inAmt < 0) {
- $("#tab-body").find('tr').eq(i).find("td").eq(15).attr("style", "background:#CC3333 ");
- } else {
- $("#tab-body").find('tr').eq(i).find("td").eq(15).attr("style", "background:#009966");
- }
+ //var deAmt = data[i].plandeAmt - data[i].realdeAmt
+ //if (deAmt < 0) {
+ // $("#tab-body").find('tr').eq(i).find("td").eq(14).attr("style", "background:#CC3333");
+ //} else {
+ // $("#tab-body").find('tr').eq(i).find("td").eq(14).attr("style", "background:#009966");
+ //}
+ //var inAmt = data[i].planinAmt - data[i].realinAmt
+ //if (inAmt < 0) {
+ // $("#tab-body").find('tr').eq(i).find("td").eq(15).attr("style", "background:#CC3333 ");
+ //} else {
+ // $("#tab-body").find('tr').eq(i).find("td").eq(15).attr("style", "background:#009966");
+ //}
}
var dataLen = data.length
for (var t = 0; t < dataLen; t++) {
- var nodes = data[t].nodes
- for (var k in data[t].nodes) {
+ var nodes = data[t].projectPlans
+ for (var k in data[t].projectPlans) {
var k = parseInt(k)
// 椤圭洰鑺傜偣瀹為檯缁撴潫鏃堕棿
- var realEndTime$ = data[t].nodes[k].realEndTime$.substring(0, 10)
+ var realEndTime$ = data[t].projectPlans[k].realEndTime$.substring(0, 10)
// 椤圭洰鑺傜偣璁″垝缁撴潫鏃堕棿
- var endTime$ = data[t].nodes[k].endTime$.substring(0, 10)
+ var endTime$ = data[t].projectPlans[k].endTime$.substring(0, 10)
var myDate = new Date()
var nowDay = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate()
var eDay = new Date(endTime$)
@@ -220,13 +220,16 @@
// 璁″垝鏃ユ湡涓庣郴缁熸棩鏈熸瘮杈�
var ExDay = eDay.getTime() - myDate.getTime()
- if (ExDay > -86400000 && ExDay < 172800000) {
+ if (ExDay > -86400000 && ExDay < 86400000) {
+ // 涓夊ぉ鍐�
$("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#CC9933");
} else if (ExDay < -86400000) {
+ // 瓒呰繃涓夊ぉ
$("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#CC3333");
- } else if (ExDay > 172800000) {
+ } else if (ExDay > 86400000) {
+ // 涓嶅埌涓夊ぉ
$("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#2e4e7e")
}
} else {
--
Gitblit v1.9.1