From bf0823846dcfd62a899162312b2c6edd59747b8a Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 12 二月 2022 08:05:31 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/webapp/static/js/projectShow.js | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index 29731ca..83877a6 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -136,13 +136,13 @@
}
// 椤圭洰鏃堕棿鍗曞厓鏍�
for(let i=0;i<days;i++){
- str = '<td class="loadBox-2">'+dateArr[i]+'</td>'
+ str = '<th class="loadBox-2">'+dateArr[i]+'</th>'
$("#tot").append(str);
// $(".loadBox").attr('style','width:50px')
}
// 鑺傜偣鏃堕棿鍗曞厓鏍�
for (let j=0;j<days;j++){
- tds = '<td class="gz-color">'+'</td>'
+ tds = '<td class="gz-color'+j+' time-color">'+'</td>'
for(let k in nodeId){
$(nodeId[k]).append(tds)
}
@@ -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 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")// 瀹為檯寮�濮嬫棩鏈熸槸 瀹為檯缁撴潫鏃ユ湡-璁″垝澶╂暟
}
}
// 瀹為檯寮�濮嬫椂闂存湭濉� 瀹為檯缁撴潫鏃堕棿鏈～
@@ -235,8 +235,26 @@
}
}
// 榧犳爣缁忚繃
- // $("#tabBody").find("tr").eq(3).find("td").eq(30).attr("style","background:#354352")
- // $("#tabBody").find("td").eq(30).attr("style","background:#f60313")
+ $(document).on('mouseover','.time-color',function () {
+ // console.log($(this).attr('class'))
+ var cls = $(this).attr('class').split(' ')[0]
+ var cll = '.'+cls
+ $(cll).addClass('over-color')
+ })
+ // 榧犳爣绂诲紑
+ $(document).on('mouseout','.time-color',function () {
+ // console.log($(this).attr('class'))
+ var cls = $(this).attr('class').split(' ')[0]
+ var cll = '.'+cls
+ $(cll).removeClass('over-color')
+ })
+ // 婊氳疆
+
+
+
+
+
+
function getDateArr(start,end) {
let option = new Date(start) // 寮�濮嬫椂闂�
let nowDate = new Date(end) // 缁撴潫鏃堕棿
@@ -273,4 +291,6 @@
}
}
})
-
\ No newline at end of file
+
+
+
--
Gitblit v1.9.1