Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r12966 -r13266 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 12966) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 13266) @@ -383,6 +383,7 @@ } catch(e) {} + return popwin; } function openFullSizeWindow(pageUrl,scrollbars){ Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r12511 -r13266 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 12511) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 13266) @@ -2,7 +2,7 @@ <%@page import="com.forgon.tools.date.DateTools"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> -<%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO"%> +<%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO,net.sf.json.JSONObject"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ page import="com.forgon.tools.SpringBeanManger,com.forgon.directory.vo.LoginUserData,com.forgon.portal.action.PortalPageAction"%> <%@ page import="java.util.Date"%> @@ -33,7 +33,9 @@ } request.setAttribute("fontSize",userData.getFontSize() == null?"12":userData.getFontSize()); request.setAttribute("departCoding",orgCoding); - + String loginUserDataJsonStr = JSONObject.fromObject(userData).toString(); + request.setAttribute("loginUserDataJsonStr",loginUserDataJsonStr); + %> @@ -125,7 +127,8 @@ @@ -268,7 +291,7 @@ - +

Index: ssts-web/src/main/webapp/WEB-INF/dwr.xml =================================================================== diff -u -r13134 -r13266 --- ssts-web/src/main/webapp/WEB-INF/dwr.xml (.../dwr.xml) (revision 13134) +++ ssts-web/src/main/webapp/WEB-INF/dwr.xml (.../dwr.xml) (revision 13266) @@ -216,6 +216,7 @@ + Index: forgon-core/src/main/java/com/forgon/portal/dwr/PortalDWRManager.java =================================================================== diff -u -r12331 -r13266 --- forgon-core/src/main/java/com/forgon/portal/dwr/PortalDWRManager.java (.../PortalDWRManager.java) (revision 12331) +++ forgon-core/src/main/java/com/forgon/portal/dwr/PortalDWRManager.java (.../PortalDWRManager.java) (revision 13266) @@ -4,6 +4,8 @@ import javax.servlet.http.HttpServletRequest; +import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.vo.LoginUserData; import com.forgon.portal.model.PortalColumn; import com.forgon.portal.service.PortalManager; @@ -47,4 +49,7 @@ public void activateSession(HttpServletRequest request) { } + public LoginUserData getLoginUserData(HttpServletRequest request){ + return AcegiHelper.getLoginUser(); + } } Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r13248 -r13266 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 13248) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 13266) @@ -24,7 +24,7 @@ {hidden :SSTS_RecycRecord_Menu,text:"回收清点",href:'javascript:void(0);',leaf:true,listeners:{ click:function(node, e){ var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; - openFullSizeWindowWithName(url,null,"recyclingWindow"); + top.recyclingWindow = openFullSizeWindowWithName(url,null,"recyclingWindow"); return; } }},