From 907f0b5fca853fcffb0754e4a57d819803b7f46d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 二月 2025 08:30:48 +0800
Subject: [PATCH] #四向库盘点、并板移库
---
src/main/webapp/views/home/console.html | 138 ++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 65 deletions(-)
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index c78e3fa..cf553e4 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);
}
/*琛ㄦ牸宸ュ叿鏍�*/
@@ -109,59 +113,63 @@
// 楗煎浘
function pieCharts(){
$.ajax({
- url:baseUrl+'/console/loc/pie/charts',
+ url: baseUrl+'/console/loc/pie/charts',
headers: {'token': localStorage.getItem('token')},
dataType: 'json',
contentType: 'application/json;charset=UTF-8',
crossDomain: true,
method: 'POST',
- success:function(res){
+ success: function(res){
var data = res.data;
- var dataPie=eval(data.rows);
- var chart = {
- plotBackgroundColor: null,
- plotBorderWidth: null,
- plotShadow: false
- };
- var title = {
- text: '搴撲綅浣跨敤姣斾緥',
- margin:1,
- style: {fontSize: '18px',color: '#777',fontWeight: 'bold'},
- y: 20
- };
- var tooltip = {
- pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
- };
- var plotOptions = {
- pie: {
- allowPointSelect: true,
- cursor: 'pointer',
- dataLabels: {
- enabled: true,
- format: '<b>{point.name}</b>: {point.percentage:.1f} %',
- style: {
- color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
- }
+ var dataPie = eval(data.rows);
+
+ Highcharts.chart('pie', {
+ chart: {
+ plotBackgroundColor: null,
+ plotBorderWidth: null,
+ plotShadow: false,
+ type: 'pie'
+ },
+ title: {
+ text: '搴撲綅浣跨敤姣斾緥',
+ margin:1,
+ style: {fontSize: '18px',color: '#777',fontWeight: 'bold'},
+ y: 5
+ },
+ credits:{
+ enabled:false
+ },
+ tooltip: {
+ pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+ },
+ legend:{
+ align:'center',
+ labelFormat:'{name}:{y}'
+ },
+ plotOptions: {
+ pie: {
+ allowPointSelect: true,
+ cursor: 'pointer',
+ dataLabels: {
+ enabled: true,
+ format: '<b>{point.name}</b>: {point.percentage:.1f} %',
+ style: {
+ color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
+ }
+ },
+ showInLegend: true,
+
}
- }
- };
- var series= [{
- type: 'pie',
- name: '搴撲綅鍗犳瘮',
- data: dataPie
- }];
-
- var json = {};
- json.chart = chart;
- json.title = title;
- json.tooltip = tooltip;
- json.series = series;
- json.plotOptions = plotOptions;
- json.credits = {enabled: false};
- $('#pie').highcharts(json);
-
+ },
+ series: [{
+ name: '搴撲綅鍗犳瘮',
+ colorByPoint: true,
+ data: dataPie
+ }]
+ });
},
- error:function(){
+ error: function(){
+ // 閿欒澶勭悊
}
});
}
@@ -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,15 @@
// 琛ㄦ牸
var pageCurr;
+ function getCol() {
+ var cols = [
+ {field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
+ ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ cols.push.apply(cols, detlCols);
+ return cols;
+ }
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -236,21 +258,7 @@
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'
@@ -268,7 +276,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
}
@@ -289,7 +297,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
}
@@ -322,4 +330,4 @@
return fmt;
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1