From ff97ed48521bcac4defb8f6c7cf07fedfbcff5ca Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 09 二月 2022 09:39:14 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/cols.js | 7 +
src/main/webapp/static/js/projectShow.js | 220 ++++++++++++++++++++++++++++++++----------------------
src/main/webapp/static/css/style.css | 2
src/main/webapp/views/index_datashow.html | 2
4 files changed, 139 insertions(+), 92 deletions(-)
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index e44810d..69f5963 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -213,8 +213,8 @@
margin-top: 1%;
margin-left: 12%;
overflow-x: scroll;
-
}
+
#details-tab th td{
border: 1px solid #d9dce3;
cursor: default;
diff --git a/src/main/webapp/static/js/cols.js b/src/main/webapp/static/js/cols.js
new file mode 100644
index 0000000..fa106ed
--- /dev/null
+++ b/src/main/webapp/static/js/cols.js
@@ -0,0 +1,7 @@
+$(function () {
+ $("tr").mousemove(function () {
+ $(this).css("background-color", "pink");
+ }).mouseout(function () {
+ $(this).css("background-color", "White");
+ })
+})
\ No newline at end of file
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index 68b0c34..2ac3849 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -63,7 +63,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>'
@@ -116,21 +116,20 @@
var strr =''
if(monthDays.length<2){ // 涓�涓湀
var gz=monthDays[0]-startTime.getDate()+1 // 褰撳墠鏈堜唤鍓╀綑澶╂暟
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
+ stt = '<th class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</th>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
$("#th-gz").append(stt)
}else if (monthDays.length<3){ // 涓や釜鏈�
var gz=monthDays[0]-startTime.getDate()+1// 褰撳墠鏈堜唤鍓╀綑澶╂暟
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
+ stt = '<th class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</th>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
var gz2 = monthDays[1]-(monthDays[1]-endTime.getDate()) // 鍓╀綑鐨勫ぉ鏁�=褰撴湀澶╂暟-锛堝綋鏈堝ぉ鏁�-缁撴潫鏃ユ湡锛�
- stt2 = '<td class="loadBox" colspan="'+gz2+'">'+newMonthArr[1]+'</td>'
+ stt2 = '<th class="loadBox" colspan="'+gz2+'">'+newMonthArr[1]+'</th>'
strr =stt +stt2
$("#th-gz").append(strr)
}else { // 涓変釜鏈堝強浠ヤ笂
var gz=monthDays[0]-startTime.getDate()+1// 褰撳墠鏈堜唤鍓╀綑澶╂暟
- stt = '<td class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</td>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
+ stt = '<th class="loadBox" colspan="'+gz+'">'+newMonthArr[0]+'</th>' // 鏈夊灏戝ぉ灏辨í璺ㄥ灏戜釜鏍煎瓙
var gz2 = monthDays[monthDays.length-1]-(monthDays[monthDays.length-1]-endTime.getDate()) // 鍓╀綑鐨勫ぉ鏁�=褰撴湀澶╂暟-锛堝綋鏈堝ぉ鏁�-缁撴潫鏃ユ湡锛�
- stt2 = '<td class="loadBox" colspan="'+gz2+'">'+newMonthArr[newMonthArr.length-1]+'</td>'
- console.log(gz2)
+ stt2 = '<th class="loadBox" colspan="'+gz2+'">'+newMonthArr[newMonthArr.length-1]+'</th>'
// 鍘婚櫎绗竴涓湀 鍜屾渶鍚庝竴涓湀
monthDays.shift()
monthDays.pop()
@@ -138,12 +137,50 @@
newMonthArr.pop()
var std = ''
for (var j=0;j<monthDays.length;j++){
- stt3 = '<td class="loadBox" colspan="'+monthDays[j]+'">'+newMonthArr[j]+'</td>'
+ stt3 = '<th class="loadBox" colspan="'+monthDays[j]+'">'+newMonthArr[j]+'</th>'
std = std + stt3
}
strr = stt + std +stt2
$("#th-gz").append(strr)
}
+ console.log(allDay)
+ 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)
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// if(allDay <= 40){
// let iday = allDay
// if(monthDays.length<2){
@@ -454,89 +491,92 @@
// }
// }
// 123
- // var nodeId2 = [],nodeId3 = []
- // for(let k = 0;k<node.length;k++){
- // var getId2 = "#"+"td-node"+k+"-gz"
- // var getId3 = "#"+"td-node"+k+"-gz-2"
- // nodeId2.push(getId2)
- // nodeId3.push(getId3)
+ var nodeId2 = [],nodeId3 = []
+ for(let k = 0;k<node.length;k++){
+ var getId2 = "#"+"td-node"+k+"-gz"
+ var getId3 = "#"+"td-node"+k+"-gz-2"
+ nodeId2.push(getId2)
+ nodeId3.push(getId3)
+ }
+ for(var i=0;i<nodeId4.length;i++){
+ $(nodeId4[i]).attr("style","background:#eeeeef")
+ }
+ // for(var j = 0;j < allDay;j++){
+ // $("#tot").find("td").eq(j+3).attr("style","background:#3597D6")
// }
- // for(var i=0;i<nodeId4.length;i++){
- // $(nodeId4[i]).attr("style","background:#eeeeef")
- // }
- // // for(var j = 0;j < allDay;j++){
- // // $("#tot").find("td").eq(j+3).attr("style","background:#3597D6")
- // // }
- // var runDay = Math.ceil((currentTime - startTime)/ day)
- // if(runDay>0){
- // for(var j = 0;j < runDay;j++){
- // $("#tot-2").find("td").eq(j).attr("style","background:#49C7D3")
- // }
- // }
- // 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 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 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"){
- // for(var j=0;j<nodeRealDay;j++){
- // $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
- // }
- // // 瀹為檯寮�濮嬫椂闂村凡濉� 瀹為檯缁撴潫鏃堕棿鏈～ 瀹為檯缁撴潫鏃堕棿鎸夐璁＄粨鏉熸椂闂村～
- // }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")
- // }else{
- // $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
- // }
- // }
- // // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜棰勮寮�濮嬫椂闂村～
- // }else if(nodeRealStartTime == "Invalid Date" && nodeRealEndTime !="Invalid Date"){
- // if(nodeEndTime<nodeRealEndTime){
- // for(var j=0;j<nodeREDay;j++){
- // $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
- // }
- // }else if(nodeEndTime>=nodeRealEndTime && nodeRealEndTime>=nodeStartTime){
- // for(var j=0;j<nodeREDay;j++){
- // $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
- // }
- // }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 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")
- // }
- // }
- // }
+ var runDay = Math.ceil((currentTime - startTime)/ day)
+ if(runDay>0){
+ for(var j = 0;j < runDay;j++){
+ $("#tot-2").find("td").eq(j).attr("style","background:#49C7D3")
+ }
+ }
+ 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 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 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"){
+ for(var j=0;j<nodeRealDay;j++){
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
+ }
+ // 瀹為檯寮�濮嬫椂闂村凡濉� 瀹為檯缁撴潫鏃堕棿鏈～ 瀹為檯缁撴潫鏃堕棿鎸夐璁＄粨鏉熸椂闂村～
+ }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")
+ }else{
+ $(nodeId3[i]).find('td').eq(intRealDay+j).attr("style","background:#49C7D3")
+ }
+ }
+ // 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿宸插～ 瀹為檯寮�濮嬫椂闂存寜棰勮寮�濮嬫椂闂村～
+ }else if(nodeRealStartTime == "Invalid Date" && nodeRealEndTime !="Invalid Date"){
+ if(nodeEndTime<nodeRealEndTime){
+ for(var j=0;j<nodeREDay;j++){
+ $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
+ }
+ }else if(nodeEndTime>=nodeRealEndTime && nodeRealEndTime>=nodeStartTime){
+ for(var j=0;j<nodeREDay;j++){
+ $(nodeId3[i]).find('td').eq(intDay+j).attr("style","background:#49C7D3")
+ }
+ }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 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) // 缁撴潫鏃堕棿
diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html
index 150a68a..5694e38 100644
--- a/src/main/webapp/views/index_datashow.html
+++ b/src/main/webapp/views/index_datashow.html
@@ -9,7 +9,7 @@
<script src="../static/js/clock.js"></script>
<script src="../static/js/tableData.js"></script>
<script src="../static/js/projectShow.js"></script>
-
+ <script src="../static/js/cols.js"></script>
</head>
<body>
<div id="root">
--
Gitblit v1.9.1