Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r27194 -r27202 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27194) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27202) @@ -1,5 +1,6 @@ var linkTarget = 'mainFrame'; var singleClickExpandTree=true; +var viewport = ''; //是否禁用虚拟篮筐(未启用disableLoadToVirtualBasket配置项目或该配置项的值为true时,则禁用,否则启用虚拟篮筐) var disableLoadToVirtualBasket = true; var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; @@ -774,7 +775,13 @@ listeners:{ click:function(node, e){ var url = WWWROOT + '/disinfectsystem/customizedreports/reportView.jsp?id=' + reportId + '&position=left'; - top.recyclingWindow = openFullSizeWindowWithName(url,'yes',"recyclingWindow"); + var recyclingWindow = openFullSizeWindowWithName(url,'yes',"recyclingWindow"); + var loop = setInterval(function() { + if(recyclingWindow.closed) { + clearInterval(loop); + folderList(); + } + }, 1000); return; } } @@ -811,9 +818,11 @@ parentTree.children[2].children = folderArr; ManagementTreeData[24] = parentTree; - - if(window.viewport){ - var trees = window.viewport.getComponent(0).getComponent(1).root; + + var viewports = viewport || ''; + + if(viewports !== ''){ + var trees = viewport.getComponent(0).getComponent(1).root; trees.childNodes[24].reload(); } Index: ssts-web/src/main/webapp/homepage/portal.js =================================================================== diff -u -r27191 -r27202 --- ssts-web/src/main/webapp/homepage/portal.js (.../portal.js) (revision 27191) +++ ssts-web/src/main/webapp/homepage/portal.js (.../portal.js) (revision 27202) @@ -95,7 +95,7 @@ } - var viewport = new Ext.Viewport({ + viewport = new Ext.Viewport({ layout : 'border', items : [{ region : 'west',