Index: ssts-web/src/main/webapp/images/up.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r35149 -r35290 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 35149) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 35290) @@ -19,44 +19,65 @@ reviewViewText = "审核"; } function setTaskGroup(taskGroup){ - packingMenu = new Ext4.menu.Menu({ - floating: true - }); - comboToussePackingMenu = new Ext4.menu.Menu({ - floating: true - }); - reviewPackingMenu = new Ext4.menu.Menu({ - floating: true - }); - for(var i=0;i'; + reviewPackingMenuBox += '
  • '+taskGroup[i]+'
  • '; + } + packingMenuBox += ''; + reviewPackingMenuBox += ''; + $('#packing').append(packingMenuBox); + $('#reviewPacking').append(reviewPackingMenuBox); + $('#packing .child li').click(function(item){ + var text = item.target.innerText; + addTab('packing',(text.replace('(','(').replace(')',')'))+'装配',encodeURI('/disinfectsystem/packing/packingView.jsp?taskGroup='+text)); }); - } - packingMenu.on('click',function(menu,item,e){ - if(isUndefinedOrNull(item)){ - return; + $('#reviewPacking .child li').click(function(item){ + var text = item.target.innerText; + addTab('reviewPacking',(text.replace('(','(').replace(')',')'))+reviewViewText,encodeURI('/disinfectsystem/packing/reviewView.jsp?taskGroup='+text)); + }); + }else { + packingMenu = new Ext4.menu.Menu({ + floating: true + }); + comboToussePackingMenu = new Ext4.menu.Menu({ + floating: true + }); + reviewPackingMenu = new Ext4.menu.Menu({ + floating: true + }); + for(var i=0;i'); + $("#"+domObj).append('
    '); //insertHtml('
    ',"domObj","tipId"); tipsEle.push(tipId); } @@ -243,8 +264,10 @@ $('#personalDesktop').css('height' , parseInt(document.body.offsetHeight) - 87 - 35); //添加个人桌面tab标签 及 个人桌面ul、li信息 initPersonalDestop(); - var desktop = getById('personalDesktop'); + if(showLeft){ + desktop = getById('leftMenu'); + } Ext4.each(desktop.query('li'),function(item){ getElement(item).on('click',function(event){ if(!isDrag){ @@ -359,72 +382,97 @@ PackingTableManager.getAllTaskGroup(setTaskGroup); DWREngine.setAsync(true); //动态生成菜单 - if (packingImg){ - packingImg.on('mouseenter', function(e) { - packingMenu.showAt(e.getXY()); - }); - } -// if (comboToussePackingImg){ -// comboToussePackingImg.on('mouseenter', function(e) { -// comboToussePackingMenu.showAt(e.getXY()); -// }); -// } - if (reviewPackingImg){ - reviewPackingImg.on('mouseenter', function(e) { - reviewPackingMenu.showAt(e.getXY()); - }); - } + if(showLeft){ + var sterilizationRecordMenuBox = ''; + $('#sterilizationRecord').append(sterilizationRecordMenuBox); + $('#sterilizationRecord .child li').click(function(item){ + var text = item.target.innerText; + addTab('sterilizationRecord',text+'灭菌',encodeURI('/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today&ownGroup='+text)); + }); - sterilizationRecordMenu = new Ext4.menu.Menu({ - floating: true - }); - - for(var i=0;i'; + arrowIcon += ''; + arrowIcon += '
    '; + arrowIcon += ''; + arrowIcon += '
    '; + } if(sstsConfig.reviewModuleVersion == 2){ returnContent += '
  • '; returnContent += '

    '; - returnContent += ''+ item['title'] +'
  • '; + returnContent += ''+ item['title'] +''+arrowIcon+''; }else { returnContent += '
  • '; returnContent += '

    '; - returnContent += ''+item['title']+'
  • '; + returnContent += ''+item['title']+''+arrowIcon+''; } return returnContent; } @@ -1158,7 +1223,20 @@ }else{ returnContent += '
  • '; returnContent += '

    '; - returnContent += ''+item['title']+'
  • '; + if(itemId == 'packing' || itemId == 'sterilizationRecord'){ + var arrowIcon = ''; + if(showLeft){ + arrowIcon += '
    '; + arrowIcon += ''; + arrowIcon += '
    '; + arrowIcon += '
    '; + arrowIcon += ''; + arrowIcon += '
    '; + } + returnContent += ''+item['title']+''+arrowIcon+''; + }else { + returnContent += ''+item['title']+''; + } } } return returnContent; @@ -1172,16 +1250,29 @@ function parsePortal(jsonObj){ var returnContent = ''; if(jsonObj){ - for(var commentIndex = 0;commentIndex < jsonObj.length;++commentIndex){ - var portalPage = jsonObj[commentIndex]; - returnContent += '
    '; - returnContent += '
      '; - var items = portalPage['portalItems']; - for(var itemIndex = 0;itemIndex < items.length;++itemIndex){ - var item = items[itemIndex]; - returnContent += parsePortItem(portalPage,item); + if(showLeft){ + for(var commentIndex = 0;commentIndex < jsonObj.length;++commentIndex){ + var portalPage = jsonObj[commentIndex]; + returnContent += '
        '; + var items = portalPage['portalItems']; + for(var itemIndex = 0;itemIndex < items.length;++itemIndex){ + var item = items[itemIndex]; + returnContent += parsePortItem(portalPage,item); + } + returnContent +='
      '; } - returnContent +='
    '; + }else { + for(var commentIndex = 0;commentIndex < jsonObj.length;++commentIndex){ + var portalPage = jsonObj[commentIndex]; + returnContent += '
    '; + returnContent += '
      '; + var items = portalPage['portalItems']; + for(var itemIndex = 0;itemIndex < items.length;++itemIndex){ + var item = items[itemIndex]; + returnContent += parsePortItem(portalPage,item); + } + returnContent +='
    '; + } } } return returnContent; @@ -1212,7 +1303,6 @@ */ function createIframeAppendToWindowBox(id,title,href){ var titelCode = escape(title.toString()); - var height=window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; @@ -1226,8 +1316,13 @@ } } var content = createFrame(id,href,height); - var div = "
    " + content + "
    "; - insertHtml(div,'windowBox'); + if(showLeft){ + var div = "
    " + content + "
    "; + insertHtml(div,'rightContent'); + }else { + var div = "
    " + content + "
    "; + insertHtml(div,'windowBox'); + } } /** * tab 标签选择变化时发生,title为新tab的标题 @@ -1275,6 +1370,13 @@ } currentActiveTabTitle = personalDesktopTitle; } + if(showLeft){ + if(title == '高级视图'){ + $('#leftMenu').hide(); + }else { + $('#leftMenu').show(); + } + } //缓存点击tab页的名称--兼容IE6 windowLocalStorage('set','title',currentActiveTabTitle); closeMenus_box(); @@ -1398,7 +1500,12 @@ function insertPersonalDesktopContent(){ var height = isTouchDevice() ? "auto" : "100%"; var destopContent = createFrame("-1","",height); - insertHtml(destopContent,'personalDesktop'); + if(showLeft){ + insertHtml(destopContent,'leftMenu'); + $('#leftMenu').css('height',(document.body.clientHeight-40)+'px') + }else { + insertHtml(destopContent,'personalDesktop'); + } } //extjs4的初始化个人桌面的方法 function initPersonalDesktopExtjs4(){ @@ -1516,12 +1623,16 @@ params : {model : '登录',type : '退出系统',description : '退出系统'}, success : function(){ top.document.location.href=WWWROOT+"/j_spring_security_logout"; + sessionStorage.removeItem('hideLogo'); + sessionStorage.removeItem('showLeftMenu'); if (top.document.location.href.indexOf("https") >=0 ){ alert("谢谢使用,您已经成功退出系统!"); window.close(); //ensure to clear SSL cache after x509 logout } },failure : function(){ top.document.location.href=WWWROOT+"/j_spring_security_logout"; + sessionStorage.removeItem('hideLogo'); + sessionStorage.removeItem('showLeftMenu'); if (top.document.location.href.indexOf("https") >=0 ){ alert("谢谢使用,您已经成功退出系统!"); window.close(); //ensure to clear SSL cache after x509 logout @@ -1530,6 +1641,8 @@ }); }catch(e){ top.document.location.href=WWWROOT+"/j_spring_security_logout"; + sessionStorage.removeItem('hideLogo'); + sessionStorage.removeItem('showLeftMenu'); if (top.document.location.href.indexOf("https") >=0 ){ alert("谢谢使用,您已经成功退出系统!"); window.close(); //ensure to clear SSL cache after x509 logout @@ -1800,11 +1913,11 @@ //设置提醒数字 var container = Ext4.getBody(); if(result.data.length<11){ - //container.insertHtml('beforeEnd','
    '); - $("#systemWarning").append('
    ') + //container.insertHtml('beforeEnd','
    '); + $("#systemWarning").append('
    ') }else{ - $("#systemWarning").append('
    '); - //container.insertHtml('beforeEnd','
    '); + $("#systemWarning").append('
    '); + //container.insertHtml('beforeEnd','
    '); } Index: ssts-web/src/main/webapp/logonSSOForSszxyy.jsp =================================================================== diff -u -r35105 -r35290 --- ssts-web/src/main/webapp/logonSSOForSszxyy.jsp (.../logonSSOForSszxyy.jsp) (revision 35105) +++ ssts-web/src/main/webapp/logonSSOForSszxyy.jsp (.../logonSSOForSszxyy.jsp) (revision 35290) @@ -17,6 +17,7 @@ ArrayList message = new ArrayList(); String byway_sso_token = request.getParameter("byway_sso_token"); String hideLogo = request.getParameter("hideLogo"); +String showLeftMenu = request.getParameter("showLeftMenu"); if(StringUtils.isNotBlank(byway_sso_token)){ try{ String userName = HttpClientHelper.authentication(byway_sso_token); @@ -37,6 +38,9 @@ if(StringUtils.isNotBlank(hideLogo)){ pageContext.setAttribute("hideLogo", hideLogo); } +if(StringUtils.isNotBlank(showLeftMenu)){ + pageContext.setAttribute("showLeftMenu", showLeftMenu); +} pageContext.setAttribute("message", message); String companyName = CssdUtils.getSystemSetConfigByName("companyName"); @@ -116,7 +120,9 @@ Index: ssts-web/src/main/webapp/images/down.png =================================================================== diff -u Binary files differ