From b97ea7083184a2b82d6ec3876094085342abaa0a Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期一, 05 九月 2022 19:06:33 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java | 3 src/main/webapp/views/index_datashow.html | 3 src/main/webapp/static/js/tableData2.js | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 202 insertions(+), 2 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java index 047a228..4b91be3 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java @@ -32,7 +32,7 @@ } @RequestMapping(value = "/flowStatus/list/auth") - @ManagerAuth +// @ManagerAuth public R list(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false) String orderByField, @@ -140,4 +140,5 @@ } return R.ok(result); } + } diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js new file mode 100644 index 0000000..0433562 --- /dev/null +++ b/src/main/webapp/static/js/tableData2.js @@ -0,0 +1,198 @@ +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 getTheaddData = function () { + $.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) + // } + // } + // }, + // }) +} + +/*****************************************************************************************************************************************************************************/ +var getThbodyData = function () { + $.ajax({ + url: baseurl + '/pms/projectPlan/toFront', + type: 'GET', + dataType: 'JSON', + data: {}, + success: function (res) { + if (res.code == 200) { + // console.log(res) + data = res.data + // 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� "" + for (var i = 0; i < data.length; i++) { + var dataNode = data[i].nodes + for (var j = 0; j < dataNode.length; j++) { + var dataNull = dataNode[j] + for (var k in dataNull) { + 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() + for (var i = 0; i < data.length; i++) { + var node = data[i].nodes + for (var j = 0; j < node.length; j++) { + var dataNull = node[j] + for (var k in dataNull) { + dataNull[k] = dataNull[k] === null ? "" : dataNull[k] + } + } + str = '' + for (var j = 0; j < node.length; j++) { + var nodeName = node[j].flowId$ // 鑺傜偣鍚嶇О + 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>' + 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>' + 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++) { + var nodes = data[t].nodes + for (var k in data[t].nodes) { + var k = parseInt(k) + // 椤圭洰鑺傜偣瀹為檯缁撴潫鏃堕棿 + var realEndTime$ = data[t].nodes[k].realEndTime$.substring(0, 10) + // 椤圭洰鑺傜偣璁″垝缁撴潫鏃堕棿 + var endTime$ = data[t].nodes[k].endTime$.substring(0, 10) + var myDate = new Date() + var nowDay = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate() + var eDay = new Date(endTime$) + // 鍒ゆ柇realEndTime$.substring(0,10) 鏄惁涓虹┖ + if (realEndTime$ === "") { + // 璁″垝鏃ユ湡涓庣郴缁熸棩鏈熸瘮杈� + 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"); + + } else if (ExDay < -86400000) { + $("#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 + 3).attr("style", "background:#2e4e7e") + } + } else { + function tab(date1, date2) { + var oDate1 = new Date(date1); + 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") + + } else { + $("#tab-body").find('tr').eq(t).find("td").eq(k + 3).attr("style", "background:#CC3333"); + + } + } + + tab(endTime$, realEndTime$,); + } + + } + } + + } + + } + }) +} + +/*****************************************************************************************************************************************************************************/ + + + diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html index 7cbb87c..a891391 100644 --- a/src/main/webapp/views/index_datashow.html +++ b/src/main/webapp/views/index_datashow.html @@ -7,7 +7,8 @@ <script src="../static/js/config.js"></script> <script src="../static/js/jquery-3.3.1.min.js"></script> <script src="../static/js/clock.js"></script> - <script src="../static/js/tableData.js"></script> +<!-- <script src="../static/js/tableData.js"></script>--> + <script src="../static/js/tableData2.js"></script> <script src="../static/js/projectShow.js"></script> <script src="../static/js/cols.js"></script> </head> -- Gitblit v1.9.1