Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r14546 -r14643 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 14546) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 14643) @@ -168,6 +168,8 @@ var tabsTempId = 1; var isDrag = false; //是否为拖拽 var personalDesktopTitle = "个人桌面"; + +var recyclingWindow = null; /** * 当前活动的Tab标签的标题 */ @@ -272,6 +274,10 @@ return; } if(user.currentOrgUnitCode != loginUserData.currentOrgUnitCode || user.userName != loginUserData.userName){ + //关闭回收触摸屏窗口 + if(recyclingWindow != null){ + recyclingWindow.close(); + } alert(msg); refreshCurrentPage(); } Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r14546 -r14643 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14546) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14643) @@ -521,7 +521,7 @@ //触摸屏直接跳转 if(itemId == 'recyclingRecordTouchScreen'){ var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; - openFullSizeWindowWithName(url,null,"recyclingWindow"); + recyclingWindow = openFullSizeWindowWithName(url,null,"recyclingWindow"); return; }; addTabJquery(itemId, subtitle, url);