From f3ed1f9e98e13b9fb631e2fab851be15b7dde206 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 08:41:48 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/webapp/static/js/tableData.js | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index eab15a0..f1f5fc2 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -1,35 +1,43 @@
setTimeout(function(){
getTheaddData()
getThbodyData()
+ getWang()
},0)
setInterval(function(){
getThbodyData()
},5000)
- var proData = ["椤圭洰鍚嶇О","寮�濮嬫椂闂�","缁撴潫鏃堕棿",]
+ var proData = ["椤圭洰鍚嶇О","鍞墠閲戦鏍哥畻","寮�濮嬫椂闂�","缁撴潫鏃堕棿",
+ "鍚堢害绛捐","鍥鹃潰浼氱","BOM璁捐/浜岀骇BOM涓嬪彂",
+ "鏉愭枡閲囪喘","鐢熶骇鍒朵綔","鍐呴儴瀹夎璋冩暣锛堢爺鍙戠墿鏂欙級","杩涘満瀹夎","绋嬪簭璋冭瘯","绯荤粺鑱旇皟","涓婄嚎杩愯","椤圭洰楠屾敹","杩愯垂","瀹夎璐�"]
var getTheaddData = function(){
- $.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)
- }
- }
- },
- })
+ 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)
+ // }
+ // }
+ // },
+ // })
}
/*****************************************************************************************************************************************************************************/
@@ -39,7 +47,7 @@
type:'GET',
dataType:'JSON',
data:{},
- success:function(res){
+ success:function(res){
if(res.code==200){
data=res.data
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
@@ -72,10 +80,25 @@
}
var str2 = '<tr id="row'+i+'" class="row">'
+'<th class="projects">'+data[i].id+'</th>'
+ +'<td class="nor-mal">'+data[i].presaleAmt+'</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>'
+ 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++){
@@ -95,13 +118,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){
@@ -109,10 +132,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");
}
}
@@ -129,5 +152,15 @@
}
/*****************************************************************************************************************************************************************************/
+ function getWang() {
+ $.ajax({
+ url:baseurl+'/pms/projectPlan/dataSummary',
+ type:'GET',
+ data:{},
+ success:function(res){
+ console.log(res)
+ }
+ })
+ }
--
Gitblit v1.9.1