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/tableData2.js | 119 +++++++++++++++--------------------------------------------
1 files changed, 30 insertions(+), 89 deletions(-)
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index f518940..9b0a439 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -3,9 +3,9 @@
getThbodyData()
getType()
}, 0)
-setInterval(function () {
- getThbodyData()
-}, 5000)
+//setInterval(function () {
+// getThbodyData()
+//}, 5000)
//琛ㄥご灏忚繘搴﹁〃
var getType = function () {
@@ -74,67 +74,6 @@
}
/*****************************************************************************************************************************************************************************/
-var resMap = [
- {
- endDay:"2023-01-16 00:00:00",
- id:"cs001",
- plandeAmt:10000,
- planinAmt: 50000,
- presaleAmt: 5000000,
- realdeAmt: 9000,
- realinAmt: 40000,
- startDay:"2022-09-15 00:00:00",
- type: "妯寮�",
- nodes:[{name: '涓氬姟涓嬪崟', startTime: '2022-09-10', endTime$: '2022-09-15', realStartTime$: '2022-09-10', realEndTime$: '2022-09-15'},
- {name: '棰勪粯娆�', startTime: '2022-09-15', endTime$: '2022-09-26', realStartTime$: '2022-09-15', realEndTime$: '2022-09-26'},
- {name: 'BOM涓婅〃', startTime: '2022-09-20', endTime$: '2022-09-30', realStartTime$: '2022-09-20', realEndTime$: '2022-09-30'},
- {name: '鐗╂枡璇疯喘', startTime: '2022-09-30', endTime$: '2022-10-10', realStartTime$: '2022-09-30', realEndTime$: '2022-10-10'},
- {name: '鏂藉伐璁″垝涔�', startTime: '2022-10-05', endTime$: '2022-10-18', realStartTime$: '2022-10-05', realEndTime$: '2022-10-18'},
- {name: '鐢熶骇璁″垝', startTime: '2022-10-18', endTime$: '2022-11-30', realStartTime$: '2022-10-18', realEndTime$: '2022-11-30'},
- {name: '鍖呰璁捐', startTime: '2022-10-25', endTime$: '2022-10-30', realStartTime$: '2022-10-25', realEndTime$: '2022-10-30'},
- {name: '瑁呰溅璁捐', startTime: '2022-10-26', endTime$: '2022-10-30', realStartTime$: '2022-10-26', realEndTime$: '2022-10-30'},
- {name: '鍙戣揣璁″垝涔�', startTime: '2022-10-27', endTime$: '2022-10-28', realStartTime$: '2022-10-27', realEndTime$: '2022-10-28'},
- {name: '鐢熶骇鍒朵綔', startTime: '2022-11-01', endTime$: '2022-12-05', realStartTime$: '2022-11-01', realEndTime$: '2022-12-05'},
- {name: '鍙戣揣', startTime: '2022-12-06', endTime$: '2022-12-10', realStartTime$: '2022-12-06', realEndTime$: '2022-12-10'},
- {name: '瀹夎闃熺‘璁�', startTime: '2022-12-15', endTime$: '2022-12-20', realStartTime$: '2022-12-15', realEndTime$: '2022-12-20'},
- {name: '鐗╂祦鍏徃纭', startTime: '2022-12-20', endTime$: '2022-12-30', realStartTime$: '2022-12-20', realEndTime$: '2022-12-30'},
- {name: '瀹夎', startTime: '2022-12-01', endTime$: '2022-12-15', realStartTime$: '2022-12-01', realEndTime$: '2022-12-15'},
- {name: '瀹屽伐鍗曠璁�', startTime: '2022-12-16', endTime$: '2022-12-18', realStartTime$: '2022-12-16', realEndTime$: '2022-12-18'},
- {name: '楠屾敹', startTime: '2023-01-06', endTime$: '2023-01-10', realStartTime$: '2023-01-06', realEndTime$: '2023-01-10'},
- {name: '鎬荤粨鎶ュ憡', startTime: '2023-01-15', endTime$: '2023-01-16', realStartTime$: '2023-01-15', realEndTime$: '2023-01-16'}
- ]
-},
- {
- endDay:"2022-09-30 00:00:00",
- id:"cs001",
- plandeAmt:10000,
- planinAmt: 50000,
- presaleAmt: 5000000,
- realdeAmt: 9000,
- realinAmt: 40000,
- startDay:"2022-09-15 00:00:00",
- type: "妯寮�",
- nodes:[{name: '涓氬姟涓嬪崟', startTime: '2022-09-10', endTime$: '2022-09-10', realStartTime$: '2022-09-30', realEndTime$: '2022-09-09'},
- {name: '棰勪粯娆�', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'},
- {name: 'BOM涓婅〃', startTime: '2022-09-24', endTime$: '2022-09-24', realStartTime$: '2022-09-25', realEndTime$: '2022-09-25'},
- {name: '鐗╂枡璇疯喘', startTime: '2022-09-30', endTime$: '2022-09-30', realStartTime$: '2022-09-29', realEndTime$: '2022-09-29'},
- {name: '鏂藉伐璁″垝涔�', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'},
- {name: '鐢熶骇璁″垝', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'},
- {name: '鍖呰璁捐', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-06', realEndTime$: '2022-09-06'},
- {name: '瑁呰溅璁捐', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'},
- {name: '鍙戣揣璁″垝涔�', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'},
- {name: '鐢熶骇鍒朵綔', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'},
- {name: '鍙戣揣', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-06', realEndTime$: '2022-09-06'},
- {name: '瀹夎闃熺‘璁�', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-06', realEndTime$: '2022-09-06'},
- {name: '鐗╂祦鍏徃纭', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-06', realEndTime$: '2022-09-06'},
- {name: '瀹夎', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-06', realEndTime$: '2022-09-06'},
- {name: '瀹屽伐鍗曠璁�', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-06', realEndTime$: '2022-09-06'},
- {name: '楠屾敹', startTime: '2022-09-06', endTime$: '2022-09-06', realStartTime$: '2022-09-27', realEndTime$: '2022-09-30'},
- {name: '鎬荤粨鎶ュ憡', startTime: '2022-09-26', endTime$: '2022-09-26', realStartTime$: '2022-09-26', realEndTime$: '2022-09-26'}
- ]
- },
-
-];
var getThbodyData = function () {
$.ajax({
url: baseurl + '/pms/projectPlan/toFront/common',
@@ -143,9 +82,8 @@
data: {},
success: function (res) {
if (res.code == 200) {
- console.log(res)
+ console.log(res)
data = res.data
- //data = resMap
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for (var i = 0; i < data.length; i++) {
var dataNode = data[i].projectPlans
@@ -190,28 +128,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,14 +158,17 @@
// 璁″垝鏃ユ湡涓庣郴缁熸棩鏈熸瘮杈�
var ExDay = eDay.getTime() - myDate.getTime()
- if (ExDay > -86400000 && ExDay < 172800000) {
- $("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#CC9933");
+ if (ExDay > -86400000 && ExDay < 86400000) {
+ // 涓夊ぉ鍐�
+ $("#tab-body").find('tr').eq(t).find("td").eq(k + 2).attr("style", "background:#CC9933");
} else if (ExDay < -86400000) {
- $("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#CC3333");
+ // 瓒呰繃涓夊ぉ
+ $("#tab-body").find('tr').eq(t).find("td").eq(k + 2).attr("style", "background:#CC3333");
- } else if (ExDay > 172800000) {
- $("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#2e4e7e")
+ } else if (ExDay > 86400000) {
+ // 涓嶅埌涓夊ぉ
+ $("#tab-body").find('tr').eq(t).find("td").eq(k + 2).attr("style", "background:#2e4e7e")
}
} else {
function tab(date1, date2) {
@@ -235,9 +176,9 @@
var oDate2 = new Date(date2);
var x = oDate1.getTime() - oDate2.getTime()
if (x >= 0) {
- $("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#009966")
+ $("#tab-body").find('tr').eq(t).find("td").eq(k + 2).attr("style", "background:#009966")
} else {
- $("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#CC3333");
+ $("#tab-body").find('tr').eq(t).find("td").eq(k + 2).attr("style", "background:#CC3333");
}
}
--
Gitblit v1.9.1