Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r30230 -r30238
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 30230)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 30238)
@@ -516,80 +516,6 @@
 	}
 }
 
-//更新进度条的状态(兼容IE8)
-function updateprogressStatusIE8(items){
-	var status = '';
-	var tousseType = '';
-	var isSterile = '';
-	for(var i=0;i<10;i++){
-		documentGetElementsByClassName('s-step')[i].className = 's-step s-step'+i;
-		documentGetElementsByClassName('IE8green'+i)[0].style.display = 'block';
-		documentGetElementsByClassName('IE8green'+i)[0].style.behavior = 'url(./PIE.htc)';
-	}
-	documentGetElementsByClassName('step3-line')[0].className = 'step3-line IE8p';
-	documentGetElementsByClassName('step7-line')[0].className = 'step7-line IE8p';
-	for(var i=0;i<items.length;i++){
-		status = items[i].get('status');
-		tousseType = items[i].get('tousseDefinition.tousseType');
-		isSterile = items[i].get('tousseDefinition.isSterile');
-	}
-	var arr = ['科室申领','已回收','已消毒','已装配','已审核','灭菌中/灭菌待确认','已灭菌','已发货','已签收','已使用'];
-	var index = arr.indexOf(status);
-
-	if(index > 0){
-		for(var i=0;i<=index;i++){
-			documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+' active';
-			documentGetElementsByClassName('IE8green'+i)[0].style.display = 'none';
-			documentGetElementsByClassName('IE8grey'+i)[0].style.display = 'none';
-			documentGetElementsByClassName('IE8red'+i)[0].style.display = 'block';
-			documentGetElementsByClassName('IE8red'+i)[0].style.behavior = 'url(./PIE.htc)';
-		}
-	}
-
-	if(tousseType == '消毒物品' && isSterile == '否'){
-		documentGetElementsByClassName('s-step5')[0].className = 's-step s-step5 none';
-		documentGetElementsByClassName('s-step6')[0].className = 's-step s-step6 none';
-		documentGetElementsByClassName('step7-line')[0].className = 'step7-line border IE8p';
-		documentGetElementsByClassName('IE8grey5')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey6')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey5')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8grey6')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8green5')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8green6')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red5')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red6')[0].style.display = 'none';
-	}else if(tousseType == '敷料包'){
-		documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none';
-		documentGetElementsByClassName('s-step2')[0].className = 's-step s-step2 none';
-		documentGetElementsByClassName('step3-line')[0].className = 'step3-line border IE8p';
-		documentGetElementsByClassName('IE8grey1')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey2')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey1')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8grey2')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8green1')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8green2')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red1')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red2')[0].style.display = 'none';
-	}else if(tousseType == '自定义器械包'){
-		documentGetElementsByClassName('s-step0')[0].className = 's-step s-step0 none';
-		documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none';
-		documentGetElementsByClassName('s-step2')[0].className = 's-step s-step2 none';
-		documentGetElementsByClassName('step3-line')[0].className = 'step3-line border IE8p';
-		documentGetElementsByClassName('IE8grey0')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey1')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey2')[0].style.display = 'block';
-		documentGetElementsByClassName('IE8grey0')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8grey1')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8grey2')[0].style.behavior = 'url(./PIE.htc)';
-		documentGetElementsByClassName('IE8green0')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8green1')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8green2')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red0')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red1')[0].style.display = 'none';
-		documentGetElementsByClassName('IE8red2')[0].style.display = 'none';
-	}
-}
-
 //初始函数
 var readyFunction = function(serverTime) {
 	var columns = new Array();
@@ -1321,7 +1247,6 @@
 //		autoHeight : true,
 //        autoScroll : true,
 		height : (fontSize == 12 ? 210 : 245),
-		margins:(isIE(8) && sstsConfig.enableTousseStatusProgressBar)?'50 0 0 0':'',
         items : {
         	layout : 'column',
 			width: fontSize == 12 ? 1100 : 1300,
@@ -1554,10 +1479,15 @@
 			minWidth : 30,
 			handleMouseEvents : false
 		},{
-			id:'progressBars'
+			id:'progressBars_1'
 		}];
+	
+	var progressBarTbar = new Ext.Toolbar({
+		items:[{
+			id:'progressBars_2'
+		}]
+	})
 
-
 	grid = new Ext.ux.ForgonPageGrid({
 		id : 'tousseInstanceGrid',
 		pageSize : 20,
@@ -1573,7 +1503,14 @@
 		columns : columns,
 		plugins : filters,
 		frame : false,
-		border : false
+		border : false,
+		listeners : {
+			'render' : function(){
+				if(window.screen.width < 1440){
+					progressBarTbar.render(this.tbar);
+				}
+			}
+		}
 	}, 
 		readerDetail, 
 		TousseInstanceTableManager.findTousseInstanceTableList,
@@ -1585,23 +1522,15 @@
 		totalDataCount = store.totalLength;
 		var items = store.data.items;
 		if(items.length == 1 && sstsConfig.enableTousseStatusProgressBar){
-			if(isIE(8)){
-				updateprogressStatusIE8(items);
-			}else {
-				updateprogressStatus(items);
-			}
+			updateprogressStatus(items);
 		}
 	});
 
 	if(sstsConfig.enableTousseStatusProgressBar){
 		grid.addListener('rowclick', function(grid, rowindex, e){
 			var selectionModel = grid.getSelectionModel();
 			var items = selectionModel.selections.items;
-			if(isIE(8)){
-				updateprogressStatusIE8(items);
-			}else {
-				updateprogressStatus(items);
-			}
+			updateprogressStatus(items);
 		}); 
 	}
 
@@ -1616,49 +1545,31 @@
 	});
 
 	Ext.onReady(function(){
-		if(sstsConfig.enableTousseStatusProgressBar){
+		if(sstsConfig.enableTousseStatusProgressBar && !isIE(8)){
 			var html = '<div class="order_status">';
 			var arr = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用'];
-			if(isIE(8)){
-				for(var i=0;i<arr.length;i++){
-					html += '<span class="s-step s-step'+i+'">';
-					html += '<b class="IE8b">';
-					html += '<b class="IE8green IE8green'+i+'"></b>';
-					html += '<b class="IE8red IE8red'+i+'"></b>';
-					html += '<b class="IE8grey IE8grey'+i+'"></b>';
-					html += '</b>';
-					if(i == 0){
-						html += '<p class="none IE8p"></p>';
-					}else if(i == 3 || i == 7){
-						html += '<p class="step'+i+'-line IE8p"></p>';
-					}else {
-						html += '<p class="IE8p"></p>';
-					}
-					html += '<div>'+arr[i]+'</div>';
-					html += '</span>';
+			for(var i=0;i<arr.length;i++){
+				html += '<span class="s-step s-step'+i+'">';
+				html += '<b>';
+				html += '<b class="green green'+i+'"></b>';
+				html += '<b class="red red'+i+'"></b>';
+				html += '<b class="grey grey'+i+'"></b>';
+				html += '</b>';
+				if(i == 0){
+					html += '<p class="none"></p>';
+				}else if(i == 3 || i == 7){
+					html += '<p class="step'+i+'-line"></p>';
+				}else {
+					html += '<p></p>';
 				}
-				html += '</div>';
-				document.getElementById('progressBar').innerHTML = html;
+				html += '<div>'+arr[i]+'</div>';
+				html += '</span>';
+			}
+			html += '</div>';
+			if(window.screen.width < 1440){
+				document.getElementById('progressBars_2').innerHTML = html;
 			}else {
-				for(var i=0;i<arr.length;i++){
-					html += '<span class="s-step s-step'+i+'">';
-					html += '<b>';
-					html += '<b class="green green'+i+'"></b>';
-					html += '<b class="red red'+i+'"></b>';
-					html += '<b class="grey grey'+i+'"></b>';
-					html += '</b>';
-					if(i == 0){
-						html += '<p class="none"></p>';
-					}else if(i == 3 || i == 7){
-						html += '<p class="step'+i+'-line"></p>';
-					}else {
-						html += '<p></p>';
-					}
-					html += '<div>'+arr[i]+'</div>';
-					html += '</span>';
-				}
-				html += '</div>';
-				document.getElementById('progressBars').innerHTML = html;
+				document.getElementById('progressBars_1').innerHTML = html;
 			}
 		}
 	})
Fisheye: Tag 30238 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/PIE.htc'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r30230 -r30238
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 30230)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 30238)
@@ -117,7 +117,7 @@
 <body>
 <style>
     #progressBars {
-        width: 100%;
+        width: 720px !important;
         height: 40px;
     }
 
@@ -135,145 +135,60 @@
 
     .order_status .s-step b {
         display: block;
-        width: 14px;
-        height: 14px;
+        width: 8px;
+        height: 8px;
         border-radius: 50%;
         position: absolute;
         left: 10px;
-        top: 21px;
+        top: 23px;
         z-index: 87
     }
 
-    .order_status .s-step b b.green {
+    .order_status .s-step b b {
         display: block;
-        width: 9px;
-        height: 9px;
+        width: 8px;
+        height: 8px;
         border-radius: 50%;
         background:#ffffff;
         left: 0;
         top: 0;
         z-index: 88;
-        behavior: url(./PIE.htc);
         border: 3px solid #367f21;
-        display: block;
     }
 
-    .order_status .s-step.active b b.red {
+    .order_status .s-step.active b b {
         border: 3px solid #f00000;
-        display: block;
-        width: 9px;
-        height: 9px;
-        border-radius: 50%;
-        background:#ffffff;
-        left: 0;
-        top: 0;
-        z-index: 88;
-        behavior: url(./PIE.htc);
-        display: none;
     }
 
-    .order_status .s-step.none b b.grey {
+    .order_status .s-step.none b b {
         border: 3px solid grey;
-        display: block;
-        width: 9px;
-        height: 9px;
-        border-radius: 50%;
-        background:#ffffff;
-        left: 0;
-        top: 0;
-        z-index: 88;
-        behavior: url(./PIE.htc);
-        display: none;
     }
 
-    .order_status .s-step b.IE8b {
-        display: block;
-        width: 14px;
-        height: 14px;
-        border-radius: 50%;
-        position: absolute;
-        left: 10px;
-        top: 18px;
-        behavior: url(./PIE.htc);
-        z-index: 87
-    }
-
-    .order_status .s-step b b.IE8green {
-        display: block;
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background:#ffffff;
-        left: 0;
-        top: 0;
-        z-index: 88;
-        behavior: url(./PIE.htc);
-        border: 2px solid #367f21;
-        display: block;
-    }
-
-    .order_status .s-step.active b b.IE8red {
-        border: 2px solid #f00000;
-        display: block;
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background:#ffffff;
-        left: 0;
-        top: 0;
-        z-index: 88;
-        behavior: url(./PIE.htc);
-        display: none;
-    }
-
-    .order_status .s-step.none b b.IE8grey {
-        border: 2px solid grey;
-        display: block;
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background:#ffffff;
-        left: 0;
-        top: 0;
-        z-index: 88;
-        behavior: url(./PIE.htc);
-        display: none;
-    }
-
     .order_status .s-step p {
         width: 60px;
-        border-top: 2px solid #367f21;
-        top: 27px;
+        border: 1px solid #367f21;
+        top: 30px;
         position: absolute;
         z-index: 86;
         left: -50px;
     }
 
-    .order_status .s-step p.IE8p {
-        width: 56px;
-        border-top: 2px solid #367f21;
-        top: 27px;
-        position: absolute;
-        z-index: 86;
-        left: -45px;
+    .order_status .s-step.active p {
+        border: 1px solid #f00000;
     }
 
-    .order_status .s-step.active p,.order_status .s-step.active p.IE8p {
-        border-top: 2px solid #f00000;
+    .order_status .s-step.none p {
+        border: 1px solid grey;
     }
 
-    .order_status .s-step.none p,.order_status .s-step.none p.IE8p {
-        border-top: 2px solid grey;
-    }
-
     .order_status .s-step p.none,.order_status .s-step.active p.none,.order_status .s-step.none p.none {
         display: none;
     }
 
     .order_status .s-step div {
         display: block;
         position: absolute;
-        top: 0px;
+        top: 3px;
         z-index: 87;
         text-align: center;
         font-size: 12px;
@@ -293,7 +208,7 @@
     }
 
     .order_status .s-step p.border {
-        border-top: 2px solid grey;
+        border: 1px solid grey;
     }
 </style>
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
@@ -303,7 +218,80 @@
     cellpadding="0" cellspacing="0">
     <tr>
         <td>
-            <div id="progressBar"></div>
+            <div id="progressBars" style="display: none;">
+                <div class="order_status">
+                    <span class="s-step s-step0">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p class="none"></p>
+                        <div>科室申领</div>
+                    </span>
+                    <span class="s-step s-step1">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>回收清点</div>
+                    </span>
+                    <span class="s-step s-step2">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>清洗消毒</div>
+                    </span>
+                    <span class="s-step s-step3">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p id="step3-line"></p>
+                        <div>已装配</div>
+                    </span>
+                    <span class="s-step s-step4">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>已审核</div>
+                    </span>
+                    <span class="s-step s-step5">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>灭菌中</div>
+                    </span>
+                    <span class="s-step s-step6">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>已灭菌</div>
+                    </span>
+                    <span class="s-step s-step7">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p id="step7-line"></p>
+                        <div>已发货</div>
+                    </span>
+                    <span class="s-step s-step8">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>已签收</div>
+                    </span>
+                    <span class="s-step s-step9">
+                        <b>
+                            <b></b>
+                        </b>
+                        <p></p>
+                        <div>已使用</div>
+                    </span>
+                </div>
+            </div>
         </td>
     </tr>
 	<tr height="100%;">