From 320ed3f4782f9662f79ecfe14d2cf3f34dd288c5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 01 八月 2023 19:52:36 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/tableData2.js | 170 ++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index 0433562..971b37e 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -3,21 +3,22 @@
getThbodyData()
getType()
}, 0)
-setInterval(function () {
- getThbodyData()
-}, 5000)
+//setInterval(function () {
+// getThbodyData()
+//}, 5000)
+//琛ㄥご灏忚繘搴﹁〃
var getType = function () {
$.ajax({
- url: baseurl + '/pms/projectPlan/dataSummary',
+ url: baseUrl + '/projectPlan/dataSummary',
type: 'GET',
data: {},
success: function (res) {
if (res.code === 200) {
var str = '<tr>'
- + '<th>' + '椤圭洰鎬绘暟' + '</th>' + '<th>' + res.data.totalQuantity + '</th>'
- + '<th>' + '闆嗘垚椤圭洰' + '</th>' + '<th>' + res.data.intoSum + '</th>'
- + '<th>' + '闈為泦鎴愰」鐩暟' + '</th>' + '<th>' + res.data.wrongInto + '</th>'
+ //+ '<th>' + '椤圭洰鎬绘暟' + '</th>' + '<th>' + res.data.totalQuantity + '</th>'
+ //+ '<th>' + '闆嗘垚椤圭洰' + '</th>' + '<th>' + res.data.intoSum + '</th>'
+ + '<th>' + '甯歌椤圭洰鏁�' + '</th>' + '<th>' + res.data.wrongInto + '</th>'
+ '<th>' + '宸查獙鏀堕」鐩暟' + '</th>' + '<th>' + res.data.inspected + '</th>'
+ '<th>' + '鏈獙鏀堕」鐩暟' + '</th>' + '<th>' + res.data.wrongInspected + '</th>'
+ '<th>' + '宸插畬宸ユ湭楠屾敹鏁�' + '</th>' + '<th>' + res.data.finished + '</th>'
@@ -30,59 +31,62 @@
/****************************************************************************************************************************************************************************/
-
-var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "鍞墠閲戦鏍哥畻", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
+// 琛ㄥご
+var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
var getTheaddData = function () {
- $.ajax({
- url: baseurl + '/pms/flowStatus/list/auth',
- type: 'GET',
- data: {},
- success: function (res) {
+ //$.ajax({
+ // url: baseurl + '/pms/flowStatus/list/auth',
+ // type: 'GET',
+ // data: {},
+ // success: function (res) {
+ //
+ // }
+ //})
+ //for (var i = 0; i < proData.length; i++) {
+ // var str = "<th class='xiangmu'>" + proData[i] + "</th>"
+ // $("#tab-header").append(str)
+ //}
- }
- })
- for (var i = 0; i < proData.length; i++) {
- var str = "<th class='xiangmu'>" + proData[i] + "</th>"
- $("#tab-header").append(str)
- }
-
- // $.ajax({
- // url:baseurl+'/pms/projectPlan/flowStatus',
- // type:'GET',
- // dataType:'JSON',
- // data:{},
- // success:function(res){
- // if(res.code==200){
- // data=res.data
- // var headStr = []
- // for(var i = 0;i<data.length;i++){
- // headStr.push(data[i].name)
- // }
- // proData = proData.concat(headStr)
- // // 琛ㄥご
- // for(var i = 0;i<proData.length;i++){
- // var str = "<th class='xiangmu'>"+proData[i]+"</th>"
- // $("#tab-header").append(str)
- // }
- // }
- // },
- // })
+ $.ajax({
+ url:baseUrl+'/projectPlan/flowStatus',
+ type:'GET',
+ dataType:'JSON',
+ data:{},
+ success:function(res){
+ console.log(res)
+ if(res.code==200){
+ data=res.data
+ var headStr = []
+ for(var i = 0;i<data.length;i++){
+ if (data[i].isAsrs == 0) {
+ headStr.push(data[i].name)
+ }
+ }
+ proData = proData.concat(headStr)
+ // 琛ㄥご
+ for(var i = 0;i<proData.length;i++){
+ var str = "<th class='xiangmu'>"+proData[i]+"</th>"
+ $("#tab-header").append(str)
+ }
+ }
+ },
+ })
}
/*****************************************************************************************************************************************************************************/
var getThbodyData = function () {
$.ajax({
- url: baseurl + '/pms/projectPlan/toFront',
+ url: baseUrl + '/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) {
@@ -91,18 +95,14 @@
}
data[i].presaleAmt = data[i].presaleAmt === null ? "" : data[i].presaleAmt;
data[i].plandeAmt = data[i].plandeAmt === null ? "" : data[i].plandeAmt;
- ;
data[i].planinAmt = data[i].planinAmt === null ? "" : data[i].planinAmt;
- ;
data[i].realdeAmt = data[i].realdeAmt === null ? "" : data[i].realdeAmt;
- ;
data[i].realinAmt = data[i].realinAmt === null ? "" : data[i].realinAmt;
- ;
}
// 琛ㄨ韩濉厖
$('#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,44 +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$)
@@ -157,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) {
@@ -172,22 +177,17 @@
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");
}
}
tab(endTime$, realEndTime$,);
}
-
}
}
-
}
-
}
})
}
--
Gitblit v1.9.1