Commit 8722f91ccc5de4b478d80b5afa10e1ec1acd9ce4
1 parent
1e836b92
审计报表导出模板修改
Showing
12 changed files
with
121 additions
and
21 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -2888,7 +2888,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -2888,7 +2888,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2888 | } | 2888 | } |
| 2889 | }); | 2889 | }); |
| 2890 | }else{ | 2890 | }else{ |
| 2891 | - sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh" | 2891 | + sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.j_name,r.s_name" |
| 2892 | + " from bsth_c_s_sp_info_real r where" | 2892 | + " from bsth_c_s_sp_info_real r where" |
| 2893 | + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'"; | 2893 | + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'"; |
| 2894 | if(line.equals("")){ | 2894 | if(line.equals("")){ |
| @@ -2897,7 +2897,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -2897,7 +2897,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2897 | }else{ | 2897 | }else{ |
| 2898 | sql += " and r.xl_bm = '"+line+"'"; | 2898 | sql += " and r.xl_bm = '"+line+"'"; |
| 2899 | } | 2899 | } |
| 2900 | - sql += " group by r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"; | 2900 | + sql += " group by r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.j_name,r.s_name"; |
| 2901 | listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() { | 2901 | listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() { |
| 2902 | @Override | 2902 | @Override |
| 2903 | public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException { | 2903 | public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException { |
| @@ -2906,6 +2906,8 @@ public class ReportServiceImpl implements ReportService{ | @@ -2906,6 +2906,8 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2906 | map.put("nbbm", arg0.getString("cl_zbh")); | 2906 | map.put("nbbm", arg0.getString("cl_zbh")); |
| 2907 | map.put("jGh", arg0.getString("j_gh")); | 2907 | map.put("jGh", arg0.getString("j_gh")); |
| 2908 | map.put("sGh", arg0.getString("s_gh")); | 2908 | map.put("sGh", arg0.getString("s_gh")); |
| 2909 | + map.put("jName", arg0.getString("j_name")); | ||
| 2910 | + map.put("sName", arg0.getString("s_name")); | ||
| 2909 | return map; | 2911 | return map; |
| 2910 | } | 2912 | } |
| 2911 | }); | 2913 | }); |
| @@ -3014,7 +3016,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -3014,7 +3016,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3014 | 3016 | ||
| 3015 | } | 3017 | } |
| 3016 | if(!zt.equals("zbh")){ | 3018 | if(!zt.equals("zbh")){ |
| 3017 | - String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh" | 3019 | + String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.s_name,r.j_name" |
| 3018 | + " from bsth_c_s_sp_info_real r where" | 3020 | + " from bsth_c_s_sp_info_real r where" |
| 3019 | + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'"; | 3021 | + " r.schedule_date_str BETWEEN '"+date+"' and '"+date2+"'"; |
| 3020 | if(line.equals("")){ | 3022 | if(line.equals("")){ |
| @@ -3023,7 +3025,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -3023,7 +3025,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3023 | }else{ | 3025 | }else{ |
| 3024 | sqls += " and r.xl_bm = '"+line+"'"; | 3026 | sqls += " and r.xl_bm = '"+line+"'"; |
| 3025 | } | 3027 | } |
| 3026 | - sqls += " group by r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"; | 3028 | + sqls += " group by r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh,r.s_name,r.j_name"; |
| 3027 | 3029 | ||
| 3028 | List<Map<String, Object>> listGroupBys=jdbcTemplate.query(sqls, new RowMapper<Map<String, Object>>() { | 3030 | List<Map<String, Object>> listGroupBys=jdbcTemplate.query(sqls, new RowMapper<Map<String, Object>>() { |
| 3029 | @Override | 3031 | @Override |
| @@ -3033,6 +3035,8 @@ public class ReportServiceImpl implements ReportService{ | @@ -3033,6 +3035,8 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3033 | map.put("nbbm", arg0.getString("cl_zbh")); | 3035 | map.put("nbbm", arg0.getString("cl_zbh")); |
| 3034 | map.put("jGh", arg0.getString("j_gh")); | 3036 | map.put("jGh", arg0.getString("j_gh")); |
| 3035 | map.put("sGh", arg0.getString("s_gh")); | 3037 | map.put("sGh", arg0.getString("s_gh")); |
| 3038 | + map.put("jName", arg0.getString("j_name")); | ||
| 3039 | + map.put("sName", arg0.getString("s_name")); | ||
| 3036 | return map; | 3040 | return map; |
| 3037 | } | 3041 | } |
| 3038 | }); | 3042 | }); |
| @@ -3125,7 +3129,9 @@ public class ReportServiceImpl implements ReportService{ | @@ -3125,7 +3129,9 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3125 | String xl_bm=m.get("line")==null?"":m.get("line").toString(); | 3129 | String xl_bm=m.get("line")==null?"":m.get("line").toString(); |
| 3126 | String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString(); | 3130 | String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString(); |
| 3127 | String jGh= m.get("jGh")==null?"":m.get("jGh").toString(); | 3131 | String jGh= m.get("jGh")==null?"":m.get("jGh").toString(); |
| 3132 | + String jName=m.get("jName")==null?"":m.get("jName").toString(); | ||
| 3128 | String sGh= m.get("sGh")==null?"":m.get("sGh").toString(); | 3133 | String sGh= m.get("sGh")==null?"":m.get("sGh").toString(); |
| 3134 | + String sName=m.get("sName")==null?"":m.get("sName").toString(); | ||
| 3129 | double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0, | 3135 | double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0, |
| 3130 | jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0, | 3136 | jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0, |
| 3131 | zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0, | 3137 | zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0, |
| @@ -3186,9 +3192,9 @@ public class ReportServiceImpl implements ReportService{ | @@ -3186,9 +3192,9 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3186 | newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm)); | 3192 | newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm)); |
| 3187 | newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm)); | 3193 | newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm)); |
| 3188 | newMap.put("jGh", jGh); | 3194 | newMap.put("jGh", jGh); |
| 3189 | - newMap.put("jName", jGh); | 3195 | + newMap.put("jName", jName); |
| 3190 | newMap.put("sGh",sGh); | 3196 | newMap.put("sGh",sGh); |
| 3191 | - newMap.put("sName", sGh); | 3197 | + newMap.put("sName", sName); |
| 3192 | newMap.put("nbbm", nbbm); | 3198 | newMap.put("nbbm", nbbm); |
| 3193 | newMap.put("jhzlc", jhzlc); | 3199 | newMap.put("jhzlc", jhzlc); |
| 3194 | newMap.put("jhlc", jhlc); | 3200 | newMap.put("jhlc", jhlc); |
src/main/resources/static/pages/forms/mould/countByBus1.xls
No preview for this file type
src/main/resources/static/pages/forms/mould/countByBus1s.xls
No preview for this file type
src/main/resources/static/pages/forms/mould/countByBus2.xls
No preview for this file type
src/main/resources/static/pages/forms/mould/vehicleloading.xls
No preview for this file type
src/main/resources/static/pages/mforms/singledatas/jquery.table2excel.min.js
| @@ -6,4 +6,4 @@ | @@ -6,4 +6,4 @@ | ||
| 6 | * Made by rainabba | 6 | * Made by rainabba |
| 7 | * Under MIT License | 7 | * Under MIT License |
| 8 | */ | 8 | */ |
| 9 | -!function(a,b,c,d){function e(b,c){this.element=b,this.settings=a.extend({},k,c),this._defaults=k,this._name=j,this.init()}function f(a){return a.filename?a.filename:"table2excel"}function g(a){var b=/(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;return a.replace(/<img[^>]*>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}function h(a){return a.replace(/<a[^>]*>|<\/a>/gi,"")}function i(a){var b=/(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;return a.replace(/<input[^>]*>|<\/input>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}var j="table2excel",k={exclude:".noExl",name:"Table2Excel",filename:"table2excel",fileext:".xls",exclude_img:!0,exclude_links:!0,exclude_inputs:!0};e.prototype={init:function(){var b=this;b.template={head:'<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8"><head>\x3c!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>',sheet:{head:"<x:ExcelWorksheet><x:Name>",tail:"</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"},mid:"</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--\x3e</head><body>",table:{head:"<table>",tail:"</table>"},foot:"</body></html>"},b.tableRows=[],a(b.element).each(function(c,d){var e="";a(d).find("tr").not(b.settings.exclude).each(function(c,d){e+="<tr>",a(d).find("td,th").not(b.settings.exclude).each(function(c,d){var f={rows:a(this).attr("rowspan"),cols:a(this).attr("colspan"),flag:a(d).find(b.settings.exclude)};f.flag.length>0?e+="<td> </td>":f.rows&f.cols?e+="<td>"+a(d).html()+"</td>":(e+="<td",f.rows>0&&(e+=" rowspan='"+f.rows+"' "),f.cols>0&&(e+=" colspan='"+f.cols+"' "),e+="/>"+a(d).html()+"</td>")}),e+="</tr>",console.log(e)}),b.settings.exclude_img&&(e=g(e)),b.settings.exclude_links&&(e=h(e)),b.settings.exclude_inputs&&(e=i(e)),b.tableRows.push(e)}),b.tableToExcel(b.tableRows,b.settings.name,b.settings.sheetName)},tableToExcel:function(d,e,g){var h,i,j,k=this,l="";if(k.format=function(a,b){return a.replace(/{(\w+)}/g,function(a,c){return b[c]})},g=void 0===g?"Sheet":g,k.ctx={worksheet:e||"Worksheet",table:d,sheetName:g},l=k.template.head,a.isArray(d))for(h in d)l+=k.template.sheet.head+g+h+k.template.sheet.tail;if(l+=k.template.mid,a.isArray(d))for(h in d)l+=k.template.table.head+"{table"+h+"}"+k.template.table.tail;l+=k.template.foot;for(h in d)k.ctx["table"+h]=d[h];if(delete k.ctx.table,!c.documentMode){var m=new Blob([k.format(l,k.ctx)],{type:"application/vnd.ms-excel"});b.URL=b.URL||b.webkitURL,i=b.URL.createObjectURL(m),j=c.createElement("a"),j.download=f(k.settings),j.href=i,c.body.appendChild(j),j.click(),c.body.removeChild(j)}else if("undefined"!=typeof Blob){l=k.format(l,k.ctx),l=[l];var n=new Blob(l,{type:"text/html"});b.navigator.msSaveBlob(n,f(k.settings))}else txtArea1.document.open("text/html","replace"),txtArea1.document.write(k.format(l,k.ctx)),txtArea1.document.close(),txtArea1.focus(),sa=txtArea1.document.execCommand("SaveAs",!0,f(k.settings));return!0}},a.fn[j]=function(b){var c=this;return c.each(function(){a.data(c,"plugin_"+j)||a.data(c,"plugin_"+j,new e(this,b))}),c}}(jQuery,window,document); | ||
| 10 | \ No newline at end of file | 9 | \ No newline at end of file |
| 10 | +!function(a,b,c,d){function e(b,c){this.element=b,this.settings=a.extend({},k,c),this._defaults=k,this._name=j,this.init()}function f(a){return a.filename?a.filename:"table2excel"}function g(a){var b=/(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;return a.replace(/<img[^>]*>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}function h(a){return a.replace(/<a[^>]*>|<\/a>/gi,"")}function i(a){var b=/(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;return a.replace(/<input[^>]*>|<\/input>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}var j="table2excel",k={exclude:".noExl",name:"Table2Excel",filename:"table2excel",fileext:".xls",exclude_img:!0,exclude_links:!0,exclude_inputs:!0};e.prototype={init:function(){var b=this;b.template={head:'<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8"><head>\x3c!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>',sheet:{head:"<x:ExcelWorksheet><x:Name>",tail:"</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"},mid:"</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--\x3e</head><body>",table:{head:"<table>",tail:"</table>"},foot:"</body></html>"},b.tableRows=[],a(b.element).each(function(c,d){var e="";a(d).find("tr").not(b.settings.exclude).each(function(c,d){e+="<tr>",a(d).find("td,th").not(b.settings.exclude).each(function(c,d){var f={rows:a(this).attr("rowspan"),cols:a(this).attr("colspan"),flag:a(d).find(b.settings.exclude)};f.flag.length>0?e+="<td> </td>":f.rows&f.cols?e+="<td>"+a(d).html()+"</td>":(e+="<td",f.rows>0&&(e+=" rowspan='"+f.rows+"' "),f.cols>0&&(e+=" colspan='"+f.cols+"' "),e+="/>"+a(d).html()+"</td>")}),e+="</tr>"}),b.settings.exclude_img&&(e=g(e)),b.settings.exclude_links&&(e=h(e)),b.settings.exclude_inputs&&(e=i(e)),b.tableRows.push(e)}),b.tableToExcel(b.tableRows,b.settings.name,b.settings.sheetName)},tableToExcel:function(d,e,g){var h,i,j,k=this,l="";if(k.format=function(a,b){return a.replace(/{(\w+)}/g,function(a,c){return b[c]})},g=void 0===g?"Sheet":g,k.ctx={worksheet:e||"Worksheet",table:d,sheetName:g},l=k.template.head,a.isArray(d))for(h in d)l+=k.template.sheet.head+g+h+k.template.sheet.tail;if(l+=k.template.mid,a.isArray(d))for(h in d)l+=k.template.table.head+"{table"+h+"}"+k.template.table.tail;l+=k.template.foot;for(h in d)k.ctx["table"+h]=d[h];if(delete k.ctx.table,!c.documentMode){var m=new Blob([k.format(l,k.ctx)],{type:"application/vnd.ms-excel"});b.URL=b.URL||b.webkitURL,i=b.URL.createObjectURL(m),j=c.createElement("a"),j.download=f(k.settings),j.href=i,c.body.appendChild(j),j.click(),c.body.removeChild(j)}else if("undefined"!=typeof Blob){l=k.format(l,k.ctx),l=[l];var n=new Blob(l,{type:"text/html"});b.navigator.msSaveBlob(n,f(k.settings))}else txtArea1.document.open("text/html","replace"),txtArea1.document.write(k.format(l,k.ctx)),txtArea1.document.close(),txtArea1.focus(),sa=txtArea1.document.execCommand("SaveAs",!0,f(k.settings));return!0}},a.fn[j]=function(b){var c=this;return c.each(function(){a.data(c,"plugin_"+j)||a.data(c,"plugin_"+j,new e(this,b))}),c}}(jQuery,window,document); | ||
| 11 | \ No newline at end of file | 11 | \ No newline at end of file |
src/main/resources/static/pages/oil/list_ph.html
| @@ -756,6 +756,7 @@ onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').rep | @@ -756,6 +756,7 @@ onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').rep | ||
| 756 | $('.in_carpark_yh[data-id='+id+']', '#ll_oil_list').val(subValue); | 756 | $('.in_carpark_yh[data-id='+id+']', '#ll_oil_list').val(subValue); |
| 757 | 757 | ||
| 758 | }); | 758 | }); |
| 759 | + $('#datatable_ylb_body_div').animate({scrollTop: '0px'}, 800); | ||
| 759 | }); | 760 | }); |
| 760 | } | 761 | } |
| 761 | 762 |
src/main/resources/static/pages/report/countMileage/countBus/company/countBusMileage.html
| @@ -229,12 +229,12 @@ | @@ -229,12 +229,12 @@ | ||
| 229 | params['xlName'] = xlName; | 229 | params['xlName'] = xlName; |
| 230 | params['zt']=zt; | 230 | params['zt']=zt; |
| 231 | params['type'] = "query"; | 231 | params['type'] = "query"; |
| 232 | - var tbodyHtml = template('countBusDaily',{list:""}); | 232 | + var tbodyHtml = template('countBusDailyGs',{list:""}); |
| 233 | var i = layer.load(2); | 233 | var i = layer.load(2); |
| 234 | $get('/report/countBusMileage',params,function(result){ | 234 | $get('/report/countBusMileage',params,function(result){ |
| 235 | layer.close(i); | 235 | layer.close(i); |
| 236 | // 把数据填充到模版中 | 236 | // 把数据填充到模版中 |
| 237 | - var tbodyHtml = template('countBusDaily',{list:result,zt:zt}); | 237 | + var tbodyHtml = template('countBusDailyGs',{list:result,zt:zt}); |
| 238 | // 把渲染好的模版html文本追加到表格中 | 238 | // 把渲染好的模版html文本追加到表格中 |
| 239 | $('#forms').html(tbodyHtml); | 239 | $('#forms').html(tbodyHtml); |
| 240 | 240 | ||
| @@ -265,7 +265,7 @@ | @@ -265,7 +265,7 @@ | ||
| 265 | 265 | ||
| 266 | }); | 266 | }); |
| 267 | </script> | 267 | </script> |
| 268 | -<script type="text/html" id="countBusDaily"> | 268 | +<script type="text/html" id="countBusDailyGs"> |
| 269 | <thead> | 269 | <thead> |
| 270 | <tr> | 270 | <tr> |
| 271 | <th colspan="31">路单数据统计表</th> | 271 | <th colspan="31">路单数据统计表</th> |
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
| @@ -229,12 +229,12 @@ | @@ -229,12 +229,12 @@ | ||
| 229 | params['xlName'] = xlName; | 229 | params['xlName'] = xlName; |
| 230 | params['zt']=zt; | 230 | params['zt']=zt; |
| 231 | params['type'] = "query"; | 231 | params['type'] = "query"; |
| 232 | - var tbodyHtml = template('countBusDaily',{list:""}); | 232 | + var tbodyHtml = template('countBusDailySj',{list:""}); |
| 233 | var i = layer.load(2); | 233 | var i = layer.load(2); |
| 234 | $get('/report/countBusMileage',params,function(result){ | 234 | $get('/report/countBusMileage',params,function(result){ |
| 235 | layer.close(i); | 235 | layer.close(i); |
| 236 | // 把数据填充到模版中 | 236 | // 把数据填充到模版中 |
| 237 | - var tbodyHtml = template('countBusDaily',{list:result,zt:zt}); | 237 | + var tbodyHtml = template('countBusDailySj',{list:result,zt:zt}); |
| 238 | // 把渲染好的模版html文本追加到表格中 | 238 | // 把渲染好的模版html文本追加到表格中 |
| 239 | $('#forms').html(tbodyHtml); | 239 | $('#forms').html(tbodyHtml); |
| 240 | 240 | ||
| @@ -265,7 +265,7 @@ | @@ -265,7 +265,7 @@ | ||
| 265 | 265 | ||
| 266 | }); | 266 | }); |
| 267 | </script> | 267 | </script> |
| 268 | -<script type="text/html" id="countBusDaily"> | 268 | +<script type="text/html" id="countBusDailySj"> |
| 269 | <thead> | 269 | <thead> |
| 270 | <tr> | 270 | <tr> |
| 271 | <th colspan="31">路单数据统计表</th> | 271 | <th colspan="31">路单数据统计表</th> |
src/main/resources/static/pages/report/countMileage/countLine/company/countLineMileage.html
| @@ -268,7 +268,7 @@ | @@ -268,7 +268,7 @@ | ||
| 268 | layer.close(i); | 268 | layer.close(i); |
| 269 | $("#datetodate").html(date+"至"+date2); | 269 | $("#datetodate").html(date+"至"+date2); |
| 270 | // 把数据填充到模版中 | 270 | // 把数据填充到模版中 |
| 271 | - var tbodyHtml = template('countLineList',{list:result}); | 271 | + var tbodyHtml = template('countLineListGs',{list:result}); |
| 272 | // 把渲染好的模版html文本追加到表格中 | 272 | // 把渲染好的模版html文本追加到表格中 |
| 273 | $('#forms .countLineNb').html(tbodyHtml); | 273 | $('#forms .countLineNb').html(tbodyHtml); |
| 274 | 274 | ||
| @@ -297,7 +297,7 @@ | @@ -297,7 +297,7 @@ | ||
| 297 | }); | 297 | }); |
| 298 | }); | 298 | }); |
| 299 | </script> | 299 | </script> |
| 300 | -<script type="text/html" id="countLineList"> | 300 | +<script type="text/html" id="countLineListGs"> |
| 301 | {{each list as obj i}} | 301 | {{each list as obj i}} |
| 302 | <tr> | 302 | <tr> |
| 303 | <td>{{obj.gs}}</td> | 303 | <td>{{obj.gs}}</td> |
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
| @@ -267,7 +267,7 @@ | @@ -267,7 +267,7 @@ | ||
| 267 | $("#datetodate").html(date+"至"+date2); | 267 | $("#datetodate").html(date+"至"+date2); |
| 268 | layer.close(i); | 268 | layer.close(i); |
| 269 | // 把数据填充到模版中 | 269 | // 把数据填充到模版中 |
| 270 | - var tbodyHtml = template('countLineList',{list:result}); | 270 | + var tbodyHtml = template('countLineListSj',{list:result}); |
| 271 | // 把渲染好的模版html文本追加到表格中 | 271 | // 把渲染好的模版html文本追加到表格中 |
| 272 | $('#forms .countLineSj').html(tbodyHtml); | 272 | $('#forms .countLineSj').html(tbodyHtml); |
| 273 | 273 | ||
| @@ -296,7 +296,7 @@ | @@ -296,7 +296,7 @@ | ||
| 296 | }); | 296 | }); |
| 297 | }); | 297 | }); |
| 298 | </script> | 298 | </script> |
| 299 | -<script type="text/html" id="countLineList"> | 299 | +<script type="text/html" id="countLineListSj"> |
| 300 | {{each list as obj i}} | 300 | {{each list as obj i}} |
| 301 | <tr> | 301 | <tr> |
| 302 | <td>{{obj.gs}}</td> | 302 | <td>{{obj.gs}}</td> |
src/main/resources/static/pages/report/sheet/sheetList.html
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | 52 | ||
| 53 | <div class="form-group"> | 53 | <div class="form-group"> |
| 54 | <input class="btn btn-default" type="button" id="query" value="查询"/> | 54 | <input class="btn btn-default" type="button" id="query" value="查询"/> |
| 55 | -<!-- <input class="btn btn-default" type="button" id="export" value="导出"/> --> | 55 | + <input class="btn btn-default" type="button" id="export" value="导出"/> |
| 56 | </div> | 56 | </div> |
| 57 | </form> | 57 | </form> |
| 58 | </div> | 58 | </div> |
| @@ -75,9 +75,27 @@ | @@ -75,9 +75,27 @@ | ||
| 75 | 75 | ||
| 76 | </tbody> | 76 | </tbody> |
| 77 | </table> | 77 | </table> |
| 78 | + | ||
| 79 | + <table class="hidden" id="forms_h"> | ||
| 80 | + <thead> | ||
| 81 | + <tr> | ||
| 82 | + <td>公司</td> | ||
| 83 | + <td>分公司</td> | ||
| 84 | + <td>线路</td> | ||
| 85 | + <td>班次数</td> | ||
| 86 | + <td>准点班次数</td> | ||
| 87 | + <td>准点率</td> | ||
| 88 | + </tr> | ||
| 89 | + </thead> | ||
| 90 | + | ||
| 91 | + <tbody> | ||
| 92 | + | ||
| 93 | + </tbody> | ||
| 94 | + </table> | ||
| 78 | </div> | 95 | </div> |
| 79 | 96 | ||
| 80 | <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px"> | 97 | <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px"> |
| 98 | + <input class="btn btn-default hidden" type="button" id="export_1" value="导出"/> | ||
| 81 | <table class="table table-bordered table-hover table-checkable" id="forms_1"> | 99 | <table class="table table-bordered table-hover table-checkable" id="forms_1"> |
| 82 | <thead> | 100 | <thead> |
| 83 | <tr class="hidden"> | 101 | <tr class="hidden"> |
| @@ -96,6 +114,23 @@ | @@ -96,6 +114,23 @@ | ||
| 96 | 114 | ||
| 97 | </tbody> | 115 | </tbody> |
| 98 | </table> | 116 | </table> |
| 117 | + <table class="hidden" id="forms_1_h"> | ||
| 118 | + <thead> | ||
| 119 | + <tr > | ||
| 120 | + <td>公司</td> | ||
| 121 | + <td>分公司</td> | ||
| 122 | + <td>日期</td> | ||
| 123 | + <td>线路</td> | ||
| 124 | + <td>班次数</td> | ||
| 125 | + <td>准点班次数</td> | ||
| 126 | + <td>准点率</td> | ||
| 127 | + </tr> | ||
| 128 | + </thead> | ||
| 129 | + | ||
| 130 | + <tbody> | ||
| 131 | + | ||
| 132 | + </tbody> | ||
| 133 | + </table> | ||
| 99 | </div> | 134 | </div> |
| 100 | </div> | 135 | </div> |
| 101 | </div> | 136 | </div> |
| @@ -218,10 +253,15 @@ | @@ -218,10 +253,15 @@ | ||
| 218 | var endDate = $("#endDate").val(); | 253 | var endDate = $("#endDate").val(); |
| 219 | var fgs=$('#fgsdm').val(); | 254 | var fgs=$('#fgsdm').val(); |
| 220 | var gs=$('#gsdm').val(); | 255 | var gs=$('#gsdm').val(); |
| 256 | + var i = layer.load(2); | ||
| 221 | $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs},function(result){ | 257 | $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs},function(result){ |
| 222 | var sheetList = template('sheetList',{list:result}); | 258 | var sheetList = template('sheetList',{list:result}); |
| 259 | + var sheetList_h = template('sheetList_h',{list:result}); | ||
| 260 | + | ||
| 223 | $('#forms tbody').html(sheetList); | 261 | $('#forms tbody').html(sheetList); |
| 262 | + $('#forms_h tbody').html(sheetList_h); | ||
| 224 | $('.btn-sheetList').on('click', showSheetList); | 263 | $('.btn-sheetList').on('click', showSheetList); |
| 264 | + layer.close(i); | ||
| 225 | }); | 265 | }); |
| 226 | // $post('/sheet/saveListSheet',function(result){ | 266 | // $post('/sheet/saveListSheet',function(result){ |
| 227 | // }); | 267 | // }); |
| @@ -232,12 +272,14 @@ | @@ -232,12 +272,14 @@ | ||
| 232 | var endDate = $("#endDate").val(); | 272 | var endDate = $("#endDate").val(); |
| 233 | $get('/sheet/listSheet',{id:id,date:date,endDate:endDate},function(result){ | 273 | $get('/sheet/listSheet',{id:id,date:date,endDate:endDate},function(result){ |
| 234 | var sheetList = template('sheetList_1',{list:result}); | 274 | var sheetList = template('sheetList_1',{list:result}); |
| 235 | - | 275 | + var sheetList_h = template('sheetList_1_h',{list:result}); |
| 236 | $('#forms_1 tbody').html(sheetList); | 276 | $('#forms_1 tbody').html(sheetList); |
| 277 | + $('#forms_1_h tbody').html(sheetList_h); | ||
| 278 | + | ||
| 237 | $('.btn-sheetList_1').on('click', openSheetList); | 279 | $('.btn-sheetList_1').on('click', openSheetList); |
| 238 | $("#forms_1 .hidden").removeClass("hidden"); | 280 | $("#forms_1 .hidden").removeClass("hidden"); |
| 239 | $("html,body").animate({scrollTop:$("#forms_1").offset().top},1000); | 281 | $("html,body").animate({scrollTop:$("#forms_1").offset().top},1000); |
| 240 | - | 282 | + $("#export_1").removeClass("hidden"); |
| 241 | }); | 283 | }); |
| 242 | } | 284 | } |
| 243 | function openSheetList(){ | 285 | function openSheetList(){ |
| @@ -259,7 +301,20 @@ | @@ -259,7 +301,20 @@ | ||
| 259 | $("#export").on("click",function(){ | 301 | $("#export").on("click",function(){ |
| 260 | var date = $("#date").val(); | 302 | var date = $("#date").val(); |
| 261 | var endDate = $("#endDate").val(); | 303 | var endDate = $("#endDate").val(); |
| 262 | - $("#forms").table2excel({ | 304 | + $("#forms_h").table2excel({ |
| 305 | + // 不被导出的表格行的CSS class类 | ||
| 306 | + exclude: ".noExl", | ||
| 307 | + // 导出的Excel文档的名称,(没看到作用) | ||
| 308 | + name: "Excel Document Name.xlsx", | ||
| 309 | + // Excel文件的名称 | ||
| 310 | + filename: date+"-"+endDate+"班次准点率" | ||
| 311 | + }); | ||
| 312 | + }) | ||
| 313 | + | ||
| 314 | + $("#export_1").on("click",function(){ | ||
| 315 | + var date = $("#date").val(); | ||
| 316 | + var endDate = $("#endDate").val(); | ||
| 317 | + $("#forms_1_h").table2excel({ | ||
| 263 | // 不被导出的表格行的CSS class类 | 318 | // 不被导出的表格行的CSS class类 |
| 264 | exclude: ".noExl", | 319 | exclude: ".noExl", |
| 265 | // 导出的Excel文档的名称,(没看到作用) | 320 | // 导出的Excel文档的名称,(没看到作用) |
| @@ -293,6 +348,24 @@ | @@ -293,6 +348,24 @@ | ||
| 293 | {{/if}} | 348 | {{/if}} |
| 294 | </script> | 349 | </script> |
| 295 | 350 | ||
| 351 | +<script type="text/html" id="sheetList_h"> | ||
| 352 | + {{each list as obj i}} | ||
| 353 | + <tr> | ||
| 354 | + <td>{{obj.gs}}</td> | ||
| 355 | + <td>{{obj.fgs}}</td> | ||
| 356 | + <td>{{obj.line}}</td> | ||
| 357 | + <td>{{obj.bcs}}</td> | ||
| 358 | + <td>{{obj.zdbcs}}</td> | ||
| 359 | + <td>{{obj.zdlv}}</td> | ||
| 360 | + </tr> | ||
| 361 | + {{/each}} | ||
| 362 | + {{if list.length == 0}} | ||
| 363 | + <tr> | ||
| 364 | + <td colspan="6"><h6 class="muted">没有找到相关数据</h6></td> | ||
| 365 | + </tr> | ||
| 366 | + {{/if}} | ||
| 367 | +</script> | ||
| 368 | + | ||
| 296 | <script type="text/html" id="sheetList_1"> | 369 | <script type="text/html" id="sheetList_1"> |
| 297 | {{each list as obj i}} | 370 | {{each list as obj i}} |
| 298 | <tr> | 371 | <tr> |
| @@ -314,4 +387,24 @@ | @@ -314,4 +387,24 @@ | ||
| 314 | <td colspan="7"><h6 class="muted">没有找到相关数据</h6></td> | 387 | <td colspan="7"><h6 class="muted">没有找到相关数据</h6></td> |
| 315 | </tr> | 388 | </tr> |
| 316 | {{/if}} | 389 | {{/if}} |
| 390 | +</script> | ||
| 391 | + | ||
| 392 | + | ||
| 393 | +<script type="text/html" id="sheetList_1_h"> | ||
| 394 | + {{each list as obj i}} | ||
| 395 | + <tr> | ||
| 396 | + <td>{{obj.gs}}</td> | ||
| 397 | + <td>{{obj.fgs}}</td> | ||
| 398 | + <td>{{obj.date}}</td> | ||
| 399 | + <td>{{obj.line}}</td> | ||
| 400 | + <td>{{obj.bcs}}</td> | ||
| 401 | + <td>{{obj.zdbcs}}</td> | ||
| 402 | + <td>{{obj.zdlv}}</td> | ||
| 403 | + </tr> | ||
| 404 | + {{/each}} | ||
| 405 | + {{if list.length == 0}} | ||
| 406 | + <tr> | ||
| 407 | + <td colspan="6"><h6 class="muted">没有找到相关数据</h6></td> | ||
| 408 | + </tr> | ||
| 409 | + {{/if}} | ||
| 317 | </script> | 410 | </script> |
| 318 | \ No newline at end of file | 411 | \ No newline at end of file |