From 28da1cf550b22c5eedf565ebae7e94b33a209f4c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 16 十二月 2024 08:54:44 +0800
Subject: [PATCH] 货主档案，货主转换
---
src/main/webapp/views/home/console.html | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 8e24cc6..ce1ed60 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -6,11 +6,12 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="/static/layui/css/layui.css" media="all">
- <script type="text/javascript" src="/static/layui/layui.js"></script>
- <script type="text/javascript" src="/static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="/static/js/echarts/echarts.min.js"></script>
- <script type="text/javascript" src="/static/js/echarts/highcharts.js"></script>
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/layui/layui.js"></script>
+ <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/js/echarts/echarts.min.js"></script>
+ <script type="text/javascript" src="../../static/js/echarts/highcharts.js"></script>
<style>
body {
background-color: #f1f1f1;
@@ -30,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);
}
/*琛ㄦ牸宸ュ叿鏍�*/
@@ -108,10 +113,11 @@
// 楗煎浘
function pieCharts(){
$.ajax({
- url:'/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){
var data = res.data;
@@ -125,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>'
@@ -148,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);
@@ -167,7 +177,7 @@
// 鎶樼嚎鍥�
function lineCharts() {
$.ajax({
- url: '/console/locIo/line/charts',
+ url: baseUrl+'/console/locIo/line/charts',
headers: {'token': localStorage.getItem('token')},
dataType: 'json',
contentType: 'application/json;charset=UTF-8',
@@ -179,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),
@@ -202,6 +212,10 @@
verticalAlign: 'middle',
borderWidth: 0
};
+ var loading = {
+ hideDuration: 3,
+ showDuration: 3
+ }
var series = dataPie;
var json = {};
json.title = title;
@@ -209,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);
@@ -218,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;
@@ -227,27 +251,14 @@
tableIns = table.render({
elem: '#stayTime',
headers: {token: localStorage.getItem('token')},
- url: '/report/viewStayTimeList.action',
+ url: baseUrl+'/report/viewStayTimeList.action',
page: true,
limit: 10,
toolbar: '#toolbar',
even: true,
cellMinWidth: 50,
- 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'}
- ]],
+ crossDomain: true,
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -265,7 +276,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
}
@@ -286,7 +297,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
}
@@ -319,4 +330,4 @@
return fmt;
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1