From 4ba070a0f35fbf7aa55057271a2c83f613d5ad12 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 12:44:29 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/projectShow.js       |   14 +++---
 src/main/webapp/static/css/style.css           |    8 ++-
 src/main/webapp/static/js/tableData2.js        |   80 +++++++++++++++++++++++++++++++++++----
 src/main/webapp/static/css/projectSchedule.css |    1 
 4 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/src/main/webapp/static/css/projectSchedule.css b/src/main/webapp/static/css/projectSchedule.css
index a4d033f..5000ccc 100644
--- a/src/main/webapp/static/css/projectSchedule.css
+++ b/src/main/webapp/static/css/projectSchedule.css
@@ -5,6 +5,7 @@
 }
 body {
 	height: 100%;
+	position: absolute;
 }
 #container {
 	padding: 10px 10px;
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index 4810845..44bea9b 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -7,10 +7,12 @@
 }
 /* 鐢诲竷 */
 #root {
-    height: 100%;
+    /*height: 100%;*/
+	min-height:100%;
     width: 100%;
+	margin: 0;
 	background-color: /* #2C3E50 */ #2e4e7e;
-	position: absolute;
+	position: relative;
 }
 #top-tab {
     width: 100%;
@@ -153,7 +155,7 @@
 }
 
 #details {
-	position: relative;
+	position: absolute;
 }
 #details .head {
 	width: 100%;
diff --git a/src/main/webapp/static/js/projectShow.js b/src/main/webapp/static/js/projectShow.js
index 83877a6..7b1392b 100644
--- a/src/main/webapp/static/js/projectShow.js
+++ b/src/main/webapp/static/js/projectShow.js
@@ -2,12 +2,12 @@
 		var index = $(".row").index(this) // 纭畾鍦ㄨ〃鏍间腑鐨勭鍑犺
 		var rowName = $(this).children(".projects").html() // 褰撳墠琛屼腑绫诲悕涓簆rojects鐨勭被涓殑鏂囧瓧
 		var project = data[index] // 鎶奷ata涓殑绗琲ndex涓」鐩� 璧嬪�肩粰project
-		if(project.id==rowName){
+		if(project.projectName==rowName){
 			// 姣旇緝鏃堕棿
 			var currT = new Date() // 褰撳墠鏃堕棿
-			var staT = new Date(project.startDay.substring(0,10)) // 椤圭洰寮�濮嬫椂闂�
-			var endT = new Date(project.endDay.substring(0,10)) // 椤圭洰缁撴潫鏃堕棿
-			var nodes = project.nodes
+			var staT = new Date(project.projectStartTime.substring(0,10)) // 椤圭洰寮�濮嬫椂闂�
+			var endT = new Date(project.projectEndTime.substring(0,10)) // 椤圭洰缁撴潫鏃堕棿
+			var nodes = project.projectPlans
 			// 鍒ゆ柇椤圭洰璁″垝鑺傜偣鏃堕棿鏄惁鏈夌┖鍊�
 			for(var i=0;i<nodes.length;i++){
 				if(nodes[i].staT==''||nodes[i].endTime$==''){
@@ -32,7 +32,7 @@
 
 			var bigDays = []
 			for(var i = 0;i<nodes.length;i++){
-				var projectsName = nodes[i].name // 鑺傜偣鍚嶇О                    鏀圭涓�涓姹傜敤
+				var projectsName = nodes[i].flowId$ // 鑺傜偣鍚嶇О                    鏀圭涓�涓姹傜敤
 				var proRET = new Date(nodes[i].realEndTime$.substring(0,10)) // 鑺傜偣瀹為檯缁撴潫鏃堕棿
 				var tab2 ='<tr id="td-node'+i+'-gz">'+'<tr id="td-node'+i+'-gz-2">'+'</tr>'
 				tab = tab +tab2
@@ -69,8 +69,8 @@
 							+'<tbody>' // 琛ㄨ韩 锛堥」鐩妭鐐瑰鏈級
 								+'<tr class="tab-body">'
 									+'<td style="height: 50px">'+'椤圭洰鎬绘椂闀�'+'</td>'
-									+'<td style="height: 50px">'+project.startDay.substring(0,10)+'</td>'
-									+'<td style="height: 50px">'+project.endDay.substring(0,10)+'</td>'
+									+'<td style="height: 50px">'+project.projectStartTime.substring(0,10)+'</td>'
+									+'<td style="height: 50px">'+project.projectEndTime.substring(0,10)+'</td>'
 								+'</tr>'
 
 			var tabLeft4 = tabLeft + tabLeft3 +'</tbody>'
diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js
index f1b1ca7..f518940 100644
--- a/src/main/webapp/static/js/tableData2.js
+++ b/src/main/webapp/static/js/tableData2.js
@@ -32,7 +32,7 @@
 /****************************************************************************************************************************************************************************/
 
 // 琛ㄥご
-var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "鍞墠閲戦鏍哥畻", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
+var proData = ["椤圭洰鍚嶇О", "椤圭洰绫诲瀷", "寮�濮嬫椂闂�", "缁撴潫鏃堕棿"]
 var getTheaddData = function () {
     //$.ajax({
     //    url: baseurl + '/pms/flowStatus/list/auth',
@@ -74,9 +74,70 @@
 }
 
 /*****************************************************************************************************************************************************************************/
+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: {},
@@ -84,9 +145,10 @@
             if (res.code == 200) {
                  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) {
@@ -102,7 +164,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) {
@@ -118,11 +180,11 @@
                         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 = ''

--
Gitblit v1.9.1