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/tableData.js | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index e08c097..1aba5b1 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -1,15 +1,39 @@
setTimeout(function(){
getTheaddData()
getThbodyData()
+ getType()
},0)
setInterval(function(){
getThbodyData()
},5000)
+
+ var getType = function () {
+ $.ajax({
+ url:baseurl+'/pms/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.inspected +'</th>'
+ +'<th>' + '鏈獙鏀堕」鐩暟' + '</th>' + '<th>'+ res.data.wrongInspected +'</th>'
+ +'<th>' + '宸插畬宸ユ湭楠屾敹鏁�' + '</th>' + '<th>'+ res.data.finished +'</th>'
+ $("#type-header").append(str)
+ }
+ }
+ })
+ }
+
+
+/****************************************************************************************************************************************************************************/
+
-
- var proData = ["椤圭洰鍚嶇О","鍞墠閲戦鏍哥畻","寮�濮嬫椂闂�","缁撴潫鏃堕棿",
+ var proData = ["椤圭洰鍚嶇О","椤圭洰绫诲瀷","鍞墠閲戦鏍哥畻","寮�濮嬫椂闂�","缁撴潫鏃堕棿",
"鍚堢害绛捐","鍥鹃潰浼氱","BOM璁捐/浜岀骇BOM涓嬪彂",
- "鏉愭枡閲囪喘","鐢熶骇鍒朵綔","鍐呴儴瀹夎璋冩暣锛堢爺鍙戠墿鏂欙級","杩涘満瀹夎","绋嬪簭璋冭瘯","绯荤粺鑱旇皟","涓婄嚎杩愯","椤圭洰楠屾敹","杩愯垂"]
+ "鏉愭枡閲囪喘","鐢熶骇鍒朵綔","鍐呴儴瀹夎璋冩暣锛堢爺鍙戠墿鏂欙級","杩涘満瀹夎","绋嬪簭璋冭瘯","绯荤粺鑱旇皟","涓婄嚎杩愯","椤圭洰楠屾敹","杩愯垂","瀹夎璐�"]
var getTheaddData = function(){
for (var i = 0;i < proData.length; i++) {
var str = "<th class='xiangmu'>"+proData[i]+"</th>"
@@ -38,7 +62,7 @@
// },
// })
}
-
+
/*****************************************************************************************************************************************************************************/
var getThbodyData = function(){
$.ajax({
@@ -47,8 +71,8 @@
dataType:'JSON',
data:{},
success:function(res){
- console.log(res)
if(res.code==200){
+ // console.log(res)
data=res.data
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for(var i = 0;i<data.length;i++){
@@ -59,6 +83,11 @@
dataNull[k] = dataNull[k] === null ? "" : dataNull[k]
}
}
+ 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()
@@ -80,11 +109,26 @@
}
var str2 = '<tr id="row'+i+'" class="row">'
+'<th class="projects">'+data[i].id+'</th>'
- +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
- +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
- +'<td class="nor-mal">'+data[i].endDay.substring(0,10)+'</td>'
- var str3 = str2 +str +'</tr>'
+ +'<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>'
+ 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>'
+ 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 dataLen = data.length
for(var t = 0;t < dataLen; t++){
@@ -104,13 +148,13 @@
var ExDay = eDay.getTime()-myDate.getTime()
if(ExDay>-86400000 && ExDay<172800000){
- $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC9933");
+ $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#CC9933");
}else if(ExDay<-86400000){
- $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
+ $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#CC3333");
}else if(ExDay>172800000){
- $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#2e4e7e")
+ $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#2e4e7e")
}
}else{
function tab(date1,date2){
@@ -118,10 +162,10 @@
var oDate2 = new Date(date2);
var x = oDate1.getTime()-oDate2.getTime()
if(x>=0){
- $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#009966")
+ $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#009966")
} else {
- $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
+ $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#CC3333");
}
}
@@ -140,3 +184,4 @@
/*****************************************************************************************************************************************************************************/
+
--
Gitblit v1.9.1