From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期一, 25 十一月 2024 13:14:11 +0800 Subject: [PATCH] #优化地图 --- src/main/webapp/static/js/report/workIn.js | 53 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js index 185e5cb..2ca190e 100644 --- a/src/main/webapp/static/js/report/workIn.js +++ b/src/main/webapp/static/js/report/workIn.js @@ -1,7 +1,7 @@ var pageCurr; function getCol() { var cols = [ - {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200} + {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200} ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'} ]; cols.push.apply(cols, detlCols); @@ -88,27 +88,38 @@ fields.push(col.field); } }); - var param = { - 'fields': fields - }; - $.ajax({ - url: baseUrl+"/report/viewWorkInExport.action", - headers: {'token': localStorage.getItem('token')}, - data: JSON.stringify(param), - dataType:'json', - contentType:'application/json;charset=UTF-8', - method: 'POST', - success: function (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) - } - } + var param = '?'; + $.each($('#search-box [name]').serializeArray(), function() { + param += this.name + '=' + this.value + '&'; }); + window.location.href = baseUrl + "/report/download/in" + param; + layer.closeAll(); + // var exportData = {}; + // $.each($('#search-box [name]').serializeArray(), function() { + // exportData[this.name] = this.value; + // }); + // var param = { + // fields: fields, + // exportData: exportData + // }; + // $.ajax({ + // url: baseUrl+"/report/viewWorkInExport.action", + // headers: {'token': localStorage.getItem('token')}, + // data: JSON.stringify(param), + // dataType:'json', + // contentType:'application/json;charset=UTF-8', + // method: 'POST', + // success: function (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) + // } + // } + // }); }); break; } -- Gitblit v1.9.1