From 1b941effd3153c45a2b50f5462b54a7f64a3411d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 13 九月 2022 16:30:21 +0800
Subject: [PATCH] ##
---
src/main/webapp/static/js/tableData2.js | 80 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index f1b1ca7..eca9afd 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 () {
@@ -32,7 +32,7 @@
/****************************************************************************************************************************************************************************/
// 琛ㄥご
-var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "鍞墠閲戦鏍哥畻", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
+var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
var getTheaddData = function () {
//$.ajax({
// url: baseurl + '/pms/flowStatus/list/auth',
@@ -76,17 +76,17 @@
/*****************************************************************************************************************************************************************************/
var getThbodyData = function () {
$.ajax({
- url: baseurl + '/pms/projectPlan/toFront',
+ url: baseurl + '/pms/projectPlan/toFront/common',
type: 'GET',
dataType: 'JSON',
data: {},
success: function (res) {
if (res.code == 200) {
- console.log(res)
+ console.log(res)
data = res.data
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for (var i = 0; i < data.length; i++) {
- var dataNode = data[i].nodes
+ var dataNode = data[i].projectPlans
for (var j = 0; j < dataNode.length; j++) {
var dataNull = dataNode[j]
for (var k in dataNull) {
@@ -102,7 +102,7 @@
// 琛ㄨ韩濉厖
$('#tab-body').empty()
for (var i = 0; i < data.length; i++) {
- var node = data[i].nodes
+ var node = data[i].projectPlans
for (var j = 0; j < node.length; j++) {
var dataNull = node[j]
for (var k in dataNull) {
@@ -111,45 +111,46 @@
}
str = ''
for (var j = 0; j < node.length; j++) {
- var nodeName = node[j].flowId$ // 鑺傜偣鍚嶇О
+ var weightNum = node[j].weightNum
+ var itemId = node[j].itemId
var nodeEndTime = node[j].endTime$.substring(0, 10)
var nodeRealStartTime = node[j].realEndTime$.substring(0, 10)
- str1 = '<td class="normal">' + '<p>' + nodeEndTime + '</p>' + '<p>' + nodeRealStartTime + '</p>' + '</td>'
+ str1 = '<td class="normal" id="item-'+ itemId + '-' + weightNum +'">' + '<p>' + nodeEndTime + '</p>' + '<p>' + nodeRealStartTime + '</p>' + '</td>'
str = str + str1
}
var str2 = '<tr id="row' + i + '" class="row">'
- + '<th class="projects">' + data[i].id + '</th>'
- + '<th class="projects">' + data[i].type + '</th>'
- + '<td class="nor-mal">' + data[i].presaleAmt + '</td>'
- + '<td class="nor-mal">' + '<p>' + data[i].startDay.substring(0, 10) + '</p>' + '</td>'
- + '<td class="nor-mal">' + '<p>' + data[i].endDay.substring(0, 10) + '</p>' + '</td>'
+ + '<th class="projects">' + data[i].projectName + '</th>'
+ + '<th class="projects">' + data[i].projectType + '</th>'
+ //+ '<td class="nor-mal">' + data[i].presaleAmt + '</td>'
+ + '<td class="nor-mal">' + '<p>' + data[i].projectStartTime.substring(0, 10) + '</p>' + '</td>'
+ + '<td class="nor-mal">' + '<p>' + data[i].projectEndTime.substring(0, 10) + '</p>' + '</td>'
var str9 = '<td class="normal">' + '<p>' + data[i].plandeAmt + '</p>' + '<p>' + data[i].realdeAmt + '</p>' + '</td>'
+ '<td class="normal">' + '<p>' + data[i].planinAmt + '</p>' + '<p>' + data[i].realinAmt + '</p>' + '</td>'
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$)
@@ -158,14 +159,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) {
@@ -173,9 +177,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