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 | 68 ++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 28 ++++++++++++-
2 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..bdaf1e8 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -79,12 +79,34 @@
return R.ok(page);
}
- // 瀵煎嚭
+// // 瀵煎嚭
+// @RequestMapping(value = "/viewStayTimeExport.action")
+// @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+// public R viewStayTimeExport(@RequestBody JSONObject param){
+// List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+// List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+// return R.ok(exportSupport(list, fields));
+// }
+// 瀵煎嚭
@RequestMapping(value = "/viewStayTimeExport.action")
@ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ public R viewStayTimeExport(){
+ // List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ // List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+ // return R.ok(exportSupport(list, fields));
+
+ // 浠庢暟鎹簱鑾峰彇鎵�鏈� ViewStayTimeBean 鍒楄〃
List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+
+ // 鑾峰彇闇�瑕佸鍑虹殑瀛楁锛堜緥濡傦紝鍙互纭紪鐮佹垨浠庡叾浠栨潵婧愬畾涔夛級
+ List<String> fields = new ArrayList<>(); // 鏍规嵁瀹為檯瀛楁璁剧疆
+ fields.add("Begin_date");
+ fields.add("Stay_time");
+ fields.add("Loc_no");
+ fields.add("anfme");
+ fields.add("matnr");
+
+ // 璋冪敤瀵煎嚭鏀寔鏂规硶
return R.ok(exportSupport(list, fields));
}
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index ce1ed60..5621ed3 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -103,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>
@@ -303,6 +306,71 @@
}
});
});
+
+
+ $(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('瀵煎嚭璇锋眰澶辫触');
+ }
+ });
+ }
});
--
Gitblit v1.9.1