Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r33869 -r34914 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 33869) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 34914) @@ -1147,13 +1147,14 @@ var height=window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; - height = height - 45; - //var height = $(window).height()-45; var secObj = document.getElementById('top_conttent1'); - if (secObj.className != "top_content_off"){ - height-=80; + var obj = document.getElementById('top_div'); + if(obj.style.display == 'block'){ + if (secObj.className != "top_content_off"){ + height-=80; + } } var content = createFrame(id,href,height); var div = "
" + content + "
"; Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r34519 -r34914 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 34519) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 34914) @@ -271,6 +271,7 @@ var TYPE_BORROWINGSINGLE = '<%=Invoice.TYPE_BORROWINGSINGLE%>';//借物单发货 var recyclingWindow = null; +var hideLogo = sessionStorage.getItem('hideLogo'); /** * 当前活动的Tab标签的标题 */ @@ -360,6 +361,9 @@ */ function initOnLoad(){ setInterval("detectCurrentUserPeriodically()", 30 * 1000); + if(hideLogo == 'true' || hideLogo == true){ + document.getElementById('top_div').style.display = 'none'; + } initSpeech(); @@ -557,7 +561,7 @@ } - +
Index: ssts-web/src/main/webapp/logonSSOForSszxyy.jsp =================================================================== diff -u -r34901 -r34914 --- ssts-web/src/main/webapp/logonSSOForSszxyy.jsp (.../logonSSOForSszxyy.jsp) (revision 34901) +++ ssts-web/src/main/webapp/logonSSOForSszxyy.jsp (.../logonSSOForSszxyy.jsp) (revision 34914) @@ -16,6 +16,7 @@ <% ArrayList message = new ArrayList(); String byway_sso_token = request.getParameter("byway_sso_token"); +String hideLogo = request.getParameter("hideLogo"); if(StringUtils.isNotBlank(byway_sso_token)){ try{ String userName = HttpClientHelper.authentication(byway_sso_token); @@ -33,6 +34,9 @@ message.add("登录失败:" + e.getMessage()); } } +if(StringUtils.isNotBlank(hideLogo)){ + request.setAttribute("hideLogo", hideLogo); +} pageContext.setAttribute("message", message); String companyName = CssdUtils.getSystemSetConfigByName("companyName"); @@ -114,6 +118,8 @@ if (top != self) { top.location = self.location; } +var hideLogo = '${hideLogo}' +sessionStorage.setItem('hideLogo',hideLogo); function autoMaxSize(){ self.moveTo(0,0); self.resizeTo(screen.availWidth,screen.availHeight);