From 8745b76acfd45eadd720d7ce6d87c77e6e0682b9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:46:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/tableData2.js | 166 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 111 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index 6d789d4..f518940 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -7,6 +7,7 @@
getThbodyData()
}, 5000)
+//琛ㄥご灏忚繘搴﹁〃
var getType = function () {
$.ajax({
url: baseurl + '/pms/projectPlan/dataSummary',
@@ -30,61 +31,124 @@
/****************************************************************************************************************************************************************************/
-
-var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "鍞墠閲戦鏍哥畻", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
+// 琛ㄥご
+var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
var getTheaddData = function () {
- $.ajax({
- url: baseurl + '/pms/flowStatus/list/auth',
- type: 'GET',
- data: {
- 'is_asrs':0
- },
- success: function (res) {
- console.log(res);
- }
- })
- for (var i = 0; i < proData.length; i++) {
- var str = "<th class='xiangmu'>" + proData[i] + "</th>"
- $("#tab-header").append(str)
- }
+ //$.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)
+ //}
- // $.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+'/pms/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 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',
+ 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
+ //data = resMap
// 鍒ゆ柇鏃堕棿鏄惁鏈塶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) {
@@ -93,18 +157,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) {
@@ -120,13 +180,14 @@
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
@@ -175,21 +236,16 @@
var x = oDate1.getTime() - oDate2.getTime()
if (x >= 0) {
$("#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 + 3).attr("style", "background:#CC3333");
-
}
}
tab(endTime$, realEndTime$,);
}
-
}
}
-
}
-
}
})
}
--
Gitblit v1.9.1