Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js =================================================================== diff -u -r40302 -r41206 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 41206) @@ -3,10 +3,24 @@ var searchCustomTimePeriodStore; var widthArr = []; var is2Column = true; +var fontSize = '12px'; function getTableHtml(result, statType) { + var columnNameArray = getTableHeaderColumnArray(result.parametMap, statType); + var colspan = 0; + for(var i=0;i" + result.parametMap.title + ""; + html += ""; html += getTableHeadHtml(result.parametMap, statType); html += ""; html += ""; @@ -381,11 +395,17 @@ params: params, success: function (response) { var result = Ext.decode(response.responseText); - title = result.parametMap.title; - var tableHtml = "

" + title + "

"; - tableHtml += getTableHtml(result, statType); - document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML = tableHtml; - myMask.hide(); + //var tableHtml = "

" + title + "

"; + var tableHtml = getTableHtml(result, statType); + setTimeout(function () { + document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML = tableHtml; + document.getElementById('thisIframe').contentWindow.document.getElementById('ToolBar').style.display = 'block'; + document.getElementById('thisIframe').contentWindow.document.getElementById('is2Column').value = true; + document.getElementById('thisIframe').contentWindow.document.getElementById('widthStr').value = widthArr.join(','); + document.getElementById('thisIframe').contentWindow.document.getElementById('startTime').value = params.startDay || ''; + document.getElementById('thisIframe').contentWindow.document.getElementById('endTime').value = params.endDay || ''; + myMask.hide(); + }, 1000); }, failure: function (response, options) { showResult(response.responseText); @@ -1099,32 +1119,7 @@ autoScroll: true,//自动显示滚动条 collapsible: true,//允许展开和收缩 bodyPadding: 5, - tbar: [{ - text: '导出', - handler: function () { - var html = document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML; - if (html !== '') { - var startTime = $Id('startTime').value; - var endTime = $Id('endTime').value; - var title = '器械包工作量统计报表(' + startTime + ' ~ ' + endTime + ')'; - var data = { - fileName: title, - fileType: ".xls",//文档类型 经测试 可以doc xls html 其他的自己去试 - html: html - } - exportMask = new Ext.LoadMask(Ext.getBody(), { - msg: '正在导出文件,请稍候!', - removeMask: true - }); - exportMask.show(); - setTimeout(function () { - exportReportExcel(data, 'thisIframe', is2Column, widthArr); - }, 1000); - } - } - }], html: '' - }); var viewport = new Ext.Viewport({ Index: ssts-web/src/main/webapp/homepage/exportMonitorData.jsp =================================================================== diff -u -r41104 -r41206 --- ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 41104) +++ ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 41206) @@ -83,6 +83,8 @@ + + @@ -167,9 +169,12 @@ var title = ''; if(document.getElementById('table').getElementsByTagName('p') && document.getElementById('table').getElementsByTagName('p').length > 0){ title = document.getElementById('table').getElementsByTagName('p')[0].innerHTML; - }else { + }else if(document.getElementById('title')){ title = document.getElementById('title').innerText; } + if(title == ''){ + return + } if (isIE()) { var fileName = title + '.xls'; var tableHtml = ''; @@ -185,6 +190,7 @@ } else { var is2Column = document.getElementById('is2Column').value; var widthStr = document.getElementById('widthStr').value; + var startTime = performance.now(); var widthArr = [] if(widthStr !== ''){ widthArr = widthStr.split(','); @@ -199,7 +205,30 @@ newIs2Column, widthArr || [] ); + var endTime = performance.now(); + var duration = endTime - startTime; + var time = parseFloat(duration/1000).toFixed(3); + var startTimeText = document.getElementById('startTime').value; + var endTimeText = document.getElementById('endTime').value; + var html = '导出了【'+ title +'】,总耗时【'+ time +'】秒,查询条件:'; + html += '开始时间:【'+startTimeText+'】'; + html += '结束时间:【'+endTimeText+'】'; + + $.ajax({ + type:'post', + dataType:'json', + url : '${ctx}/log/saveLog.do', + data:{ + "model":'报表管理', + "type":'导出报表', + "description":html + }, + success : function(result) { + + } + }); } + } function exportToWord(){ // 1. 获取要导出的HTML内容[1,4](@ref) Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js =================================================================== diff -u -r38832 -r41206 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 38832) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 41206) @@ -937,6 +937,8 @@ document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml; document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'none'; document.getElementById('thisIframe2').contentWindow.document.getElementById('echarts').style.display = 'none'; + document.getElementById('thisIframe2').contentWindow.document.getElementById('startTime').value = params.startTime || ''; + document.getElementById('thisIframe2').contentWindow.document.getElementById('endTime').value = params.endTime || ''; } else { searchReportForChart('echarts', result.parametMap.title, result.data); document.getElementById('thisIframe2').contentWindow.document.getElementById('table').style.display = 'none'; @@ -958,6 +960,8 @@ document.getElementById('thisIframe2').contentWindow.document.getElementById('is2Column').value = 2; } document.getElementById('thisIframe2').contentWindow.document.getElementById('widthStr').value = widthArr.join(','); + document.getElementById('thisIframe2').contentWindow.document.getElementById('startTime').value = params.startTime || ''; + document.getElementById('thisIframe2').contentWindow.document.getElementById('endTime').value = params.endTime || ''; myMask.hide(); }, 1000); } Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r40690 -r41206 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 40690) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 41206) @@ -804,6 +804,8 @@ document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block'; document.getElementById('thisIframe2').contentWindow.document.getElementById('is2Column').value = true; document.getElementById('thisIframe2').contentWindow.document.getElementById('widthStr').value = widthArr.join(','); + document.getElementById('thisIframe2').contentWindow.document.getElementById('startTime').value = params.startTime || ''; + document.getElementById('thisIframe2').contentWindow.document.getElementById('endTime').value = params.endTime || ''; myMask.hide(); }, 1000); } else { @@ -841,6 +843,8 @@ document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block'; document.getElementById('thisIframe2').contentWindow.document.getElementById('is2Column').value = true; document.getElementById('thisIframe2').contentWindow.document.getElementById('widthStr').value = widthArr.join(','); + document.getElementById('thisIframe2').contentWindow.document.getElementById('startTime').value = params.startTime || ''; + document.getElementById('thisIframe2').contentWindow.document.getElementById('endTime').value = params.endTime || ''; myMask.hide(); }, 1000); } else {