Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js =================================================================== diff -u -r28408 -r28410 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28408) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28410) @@ -18,6 +18,33 @@ } var IDS = Ext.id(); +/* + *IE8以下兼容document.getElementsByClassName + */ +function documentGetElementsByClassName(document,className) { + if (!document.getElementsByClassName) { + document.getElementsByClassName = function(className) { + var children = document.getElementsByTagName('*'); + var elements = new Array(); + for (var i = 0; i < children.length; i++) { + var child = children[i]; + var classNames = child.className.split(' '); + for (var j = 0; j < classNames.length; j++) { + if (classNames[j] == className) { + elements.push(child); + break; + } + } + } + return elements; + }; + + return document.getElementsByClassName(className); + } else { + return document.getElementsByClassName(className); + } +} + function loadData() { var goodName = $Id('goodsSearch').value; var tousseType = $Id('tousseType').value; @@ -83,20 +110,22 @@ totalRecyclingAmount += attributes.recyclingAmount; totalSendOutAmount += attributes.sendOutAmount; } - var len = $Id(title).getElementsByClassName('master-task').length; + var len = documentGetElementsByClassName($Id(title),'master-task').length; for(var i=0;i 0){ + var childNodes = documentGetElementsByClassName($Id(title),'master-task')[i]; + if(documentGetElementsByClassName(childNodes,'x-tree-elbow-plus').length > 0){ (function(p){ - $Id(title).getElementsByClassName('master-task')[i].getElementsByClassName('x-tree-elbow-plus')[0].onclick = function() { - var tousseName = this.parentNode.getElementsByClassName('x-tree-node-anchor')[0].innerText; + var parentNode = documentGetElementsByClassName($Id(title),'master-task')[i]; + documentGetElementsByClassName(parentNode,'x-tree-elbow-plus')[0].onclick = function() { + var tousseName = documentGetElementsByClassName(this.parentNode,'x-tree-node-anchor')[0].innerText; nodeClick(store,title,queryParam,tousseName,p); } })(i); - }else if(childNodes.getElementsByClassName('x-tree-elbow-end-plus').length > 0){ + }else if(documentGetElementsByClassName(childNodes,'x-tree-elbow-end-plus').length > 0){ (function(p){ - $Id(title).getElementsByClassName('master-task')[i].getElementsByClassName('x-tree-elbow-end-plus')[0].onclick = function() { - var tousseName = this.parentNode.getElementsByClassName('x-tree-node-anchor')[0].innerText; + var childNodes = documentGetElementsByClassName($Id(title),'master-task')[i]; + documentGetElementsByClassName(childNodes,'x-tree-elbow-end-plus')[0].onclick = function() { + var tousseName = documentGetElementsByClassName(this.parentNode,'x-tree-node-anchor')[0].innerText; nodeClick(store,title,queryParam,tousseName,p); } })(i); Index: ssts-web/src/main/webapp/homepage/exportOperateData.jsp =================================================================== diff -u -r28333 -r28410 --- ssts-web/src/main/webapp/homepage/exportOperateData.jsp (.../exportOperateData.jsp) (revision 28333) +++ ssts-web/src/main/webapp/homepage/exportOperateData.jsp (.../exportOperateData.jsp) (revision 28410) @@ -11,14 +11,15 @@ String startDate = request.getParameter("startDate"); String endDate = request.getParameter("endDate"); String orgUnitCoding = request.getParameter("orgUnitCoding"); +String tousseGroupName = request.getParameter("tousseGroupName"); String sDate = startDate.split(" ")[0]; String eDate = endDate.split(" ")[0]; String fileName="消毒供应中心运作监控明细表("+sDate+" ~ "+eDate+").xls"; ServletOutputStream servletOutputStream = response.getOutputStream(); response.setContentType("application/octet-stream"); response.addHeader("Content-Disposition","attachment;filename=" + new String(fileName.getBytes("GBK"), "ISO8859_1")); SupplyRoomControlManager supplyRoomControlManager = (SupplyRoomControlManager)SpringBeanManger.getBean("supplyRoomControlManager"); -supplyRoomControlManager.createOperateData(request,servletOutputStream,goodNmae,tousseType,department,startDate,endDate,orgUnitCoding,comboTousseType,taskGroups); +supplyRoomControlManager.createOperateData(request,servletOutputStream,goodNmae,tousseType,department,startDate,endDate,orgUnitCoding,comboTousseType,taskGroups,tousseGroupName); servletOutputStream.flush(); out.clear(); out = pageContext.pushBody();