Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30238 -r30257 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30238) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30257) @@ -1509,6 +1509,33 @@ if(window.screen.width < 1440){ progressBarTbar.render(this.tbar); } + if(sstsConfig.enableTousseStatusProgressBar && !isIE(8)){ + var html = '
'; + var arr = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; + for(var i=0;i'; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + if(i == 0){ + html += '

'; + }else if(i == 3 || i == 7){ + html += '

'; + }else { + html += '

'; + } + html += '
'+arr[i]+'
'; + html += ''; + } + html += '
'; + if(window.screen.width < 1440){ + document.getElementById('progressBars_2').innerHTML = html; + }else { + document.getElementById('progressBars_1').innerHTML = html; + } + } } } }, @@ -1545,33 +1572,7 @@ }); Ext.onReady(function(){ - if(sstsConfig.enableTousseStatusProgressBar && !isIE(8)){ - var html = '
'; - var arr = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; - for(var i=0;i'; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - if(i == 0){ - html += '

'; - }else if(i == 3 || i == 7){ - html += '

'; - }else { - html += '

'; - } - html += '
'+arr[i]+'
'; - html += ''; - } - html += '
'; - if(window.screen.width < 1440){ - document.getElementById('progressBars_2').innerHTML = html; - }else { - document.getElementById('progressBars_1').innerHTML = html; - } - } + }) } Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r30238 -r30257 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30238) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30257) @@ -10,6 +10,7 @@ + <%@ include file="/common/includeExtJsAndCss.jsp"%> <%@ include file="/common/includeExtJs4_2.jsp"%> <% Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r29513 -r30257 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 29513) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 30257) @@ -79,7 +79,7 @@ %> - + ${title}