From 2f932f2675b0e7cfa7c5466b058d93aec67d6f3c Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:44 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 77 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 6e3e343..22c2297 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -31,11 +31,15 @@
display: inline-block;
width: 49%;
}
+ .chart-elem div {
+ padding-top: 15px;
+ padding-bottom: 5px;
+ }
.chart-elem:first-child {
padding: 0 50px;
}
.chart-elem:last-child {
- padding-left: 20px;
+ padding: 0 50px;
border-left: 1px solid rgba(0,0,0,.1);
}
/*琛ㄦ牸宸ュ叿鏍�*/
@@ -127,7 +131,7 @@
text: '搴撲綅浣跨敤姣斾緥',
margin:1,
style: {fontSize: '18px',color: '#777',fontWeight: 'bold'},
- y: 20
+ y: 5
};
var tooltip = {
pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
@@ -150,13 +154,17 @@
name: '搴撲綅鍗犳瘮',
data: dataPie
}];
-
+ var loading = {
+ hideDuration: 3,
+ showDuration: 3
+ };
var json = {};
json.chart = chart;
json.title = title;
json.tooltip = tooltip;
json.series = series;
json.plotOptions = plotOptions;
+ json.loading = loading;
json.credits = {enabled: false};
$('#pie').highcharts(json);
@@ -181,7 +189,7 @@
text: '鏃ュ叆鍑哄簱鏁伴噺',
margin: 1,
style: {fontSize: '18px',color: '#777',fontWeight: 'bold'},
- y: 20
+ y: 5
};
var xAxis = {
categories: [getDate(-11), getDate(-10), getDate(-9), getDate(-8), getDate(-7), getDate(-6),
@@ -204,6 +212,10 @@
verticalAlign: 'middle',
borderWidth: 0
};
+ var loading = {
+ hideDuration: 3,
+ showDuration: 3
+ }
var series = dataPie;
var json = {};
json.title = title;
@@ -211,6 +223,7 @@
json.yAxis = yAxis;
json.tooltip = tooltip;
json.legend = legend;
+ json.loading = loading;
json.series = series;
json.credits = {enabled: false};
$('#line').highcharts(json);
@@ -220,6 +233,21 @@
// 琛ㄦ牸
var pageCurr;
+ function getCol() {
+ var cols = [
+ //{field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 165}
+ {field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟',width: 90}
+ ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺',width: 90}
+ ,{field: 'store_min', title: '搴撳瓨涓嬮檺', align: 'center'}
+ ,{field: 'sum_qty', title: '搴撳瓨鎬绘暟', align: 'center'}
+ ,{field: 'store_max', title: '搴撳瓨涓婇檺', align: 'center'}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�',width: 90}
+
+ ];
+ cols.push.apply(cols, detlCols);
+ //cols.push({field: 'sum_qty', title: '搴撳瓨鎬绘暟', align: 'center'})
+ return cols;
+ }
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -236,26 +264,13 @@
even: true,
cellMinWidth: 50,
crossDomain: true,
- cols: [[
- {field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
- ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- // ,{field: 'tbnum', align: 'center',title: '璇锋眰缂栧彿'}
- // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- ]],
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
},
parseData: function (res) {
+ console.log(res)
return {
'code': res.code,
'msg': res.msg,
@@ -267,6 +282,38 @@
statusCode: 200
},
done: function(res, curr, count) {
+ var that = this.elem.next();
+ console.log(res.data)
+ res.data.forEach(function (item, index) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ if (item.store_max_date != null) {
+ if (item.stay_time > item.store_max_date) {
+ tr.css("background-color", "#ff6f00");
+ tr.css("color", "white");
+ tr.children()[1].style.backgroundColor="#ff0000"
+ }
+ }
+ //浣庝簬涓嬮檺
+ if (item.sum_qty < item.store_min) {
+ tr.css("background-color", "#ff6f00");
+ tr.css("color", "white");
+ tr.children()[2].style.backgroundColor="rgb(255,0,0)"
+ tr.children()[2].style.color="white"
+ tr.children()[3].style.backgroundColor="#ff0000"
+ tr.children()[3].style.color="white"
+ }
+ //楂樹簬涓婇檺
+ if(item.store_max != null) {
+ if (item.sum_qty > item.store_max) {
+ tr.css("background-color", "#ff6f00");
+ tr.css("color", "white");
+ tr.children()[3].style.backgroundColor="#009c04"
+ tr.children()[3].style.color="white"
+ tr.children()[4].style.backgroundColor="#3da83f"
+ tr.children()[4].style.color="white"
+ }
+ }
+ });
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -288,6 +335,16 @@
curr: 1
},
done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (item.store_max_date != null) {
+ if (item.stay_time > item.store_max_date) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ tr.css("background-color", "#FF5722");
+ tr.css("color", "white");
+ }
+ }
+ });
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -322,4 +379,4 @@
return fmt;
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1