From adcfd92279f68d2353e2caa5522f71282f6e0943 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 16 十月 2024 08:18:51 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 120 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index c78e3fa..5621ed3 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);
}
/*琛ㄦ牸宸ュ叿鏍�*/
@@ -99,6 +103,9 @@
<div class="home-elem loc-retention">
<div class="layui-form">
<div id="form-header">搴撳瓨婊炵暀鏃堕棿缁熻琛�</div>
+ <div>
+ <button class="layui-btn" id="export-btn">瀵煎嚭</button>
+ </div>
<table class="layui-hide" id="stayTime" lay-filter="stayTime"></table>
</div>
</div>
@@ -127,7 +134,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 +157,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 +192,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 +215,10 @@
verticalAlign: 'middle',
borderWidth: 0
};
+ var loading = {
+ hideDuration: 3,
+ showDuration: 3
+ }
var series = dataPie;
var json = {};
json.title = title;
@@ -211,6 +226,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 +236,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 +261,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 +279,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
}
@@ -289,12 +300,77 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
}
});
});
+
+
+ $(document).ready(function() {
+ // 涓哄鍑烘寜閽坊鍔犵偣鍑讳簨浠�
+ $('#export-btn').click(function() {
+ // 杩欓噷娣诲姞瀵煎嚭閫昏緫
+ alert('瀵煎嚭鍔熻兘宸茶Е鍙戯紒');
+ // 浣犲彲浠ュ湪杩欓噷璋冪敤鍏蜂綋鐨勫鍑哄嚱鏁�
+ exportData();
+ });
+ });
+ // var table1 = layui.table1;
+
+ function exportData() {
+ var searchData = {};
+
+ // 鏀堕泦褰撳墠鎼滅储妗嗙殑鍊�
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+
+ // 鍙戦�佸鍑鸿姹傦紝鎮ㄩ渶瑕佹牴鎹偍鐨勫叿浣撴儏鍐佃皟鏁� URL
+ // $.ajax({
+ // url: baseUrl + '/report/viewStayTimeExport.action', // 璇锋浛鎹负瀹為檯鐨勫鍑烘帴鍙�
+ // method: 'POST',
+ // data: JSON.stringify(searchData), // 鍙戦�佺殑鍙傛暟
+ // contentType: 'application/json;charset=UTF-8',
+ // headers: {'token': localStorage.getItem('token')}, // 娣诲姞 token
+ // success: function(res) {
+ // // 鍋囪鍚庣杩斿洖鐨勬槸涓�涓枃浠朵笅杞介摼鎺�
+ // if (res.code === 200 && res.data.downloadUrl) {
+ // window.location.href = res.data.downloadUrl; // 鑷姩瑙﹀彂涓嬭浇
+ // } else {
+ // layer.msg(res.msg || '瀵煎嚭澶辫触');
+ // }
+ // },
+ // error: function() {
+ // layer.msg('瀵煎嚭璇锋眰澶辫触');
+ // }
+ // });
+ var titles=[];
+ var fields=[];
+ $.ajax({
+ url: baseUrl + '/report/viewStayTimeExport.action', // 璇锋浛鎹负瀹為檯鐨勫鍑烘帴鍙�
+ method: 'GET', // 灏濊瘯浣跨敤 GET 璇锋眰
+ contentType: 'application/json;charset=UTF-8',
+ headers: {'token': localStorage.getItem('token')},
+ success: function(res) {
+ console.log("res")
+ console.log(res)
+ // 鍋囪鍚庣杩斿洖鐨勬槸涓�涓枃浠朵笅杞介摼鎺�
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ },
+ error: function() {
+ layer.msg('瀵煎嚭璇锋眰澶辫触');
+ }
+ });
+ }
});
@@ -322,4 +398,4 @@
return fmt;
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1