Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r27855 -r27876
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 27855)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 27876)
@@ -665,7 +665,7 @@
     var posStatement="top="+top+",left="+left+",width="+width+",height="+height;
    	var style='menubar=no,location=yes,directories=no,toolbar=no,statusbar=no,resizable=yes,'
 		+posStatement+",scrollbars="+scrollbars;
-    var popwin=window.open(pageUrl,windowName,style);
+    var popwin=window.open(pageUrl+'&source=portalPage',windowName,style);
     if(popwin == null){
     	return false;
     }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r27859 -r27876
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 27859)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 27876)
@@ -238,13 +238,98 @@
 var params_departCoding = '${param.departCoding}';
 //当前登录用户所属供应室类型
 var params_type = ${supplyRoomType};
-
+var source = '${param.source}';
 layer.config({
 	extend: 'myskin/style.css', //加载您的扩展样式
   	skin: 'layer-ext-myskin'
 });
 //layer.alert('layer皮肤-myskin');
+function isIE(value) {
+    var vals = value || '';
+    if(!!window.ActiveXObject || "ActiveXObject" in window){
+        if(vals !== ''){
+            var DEFAULT_VERSION = 8.0;  
+            var ua = navigator.userAgent.toLowerCase();
+            var safariVersion = ua.match(/msie ([\d.]+)/) || ''; 
+            if(safariVersion == ''){
+                return false;
+            }
+            if(safariVersion[1] <= DEFAULT_VERSION ){  
+                return true;
+            }else {
+                return false;
+            }
+        }
 
+        return true;
+    }else{
+        return false;
+　　 }
+}
+
+function getRatio(){
+    var ratio=0;
+    var ratio=0;
+    var screen=window.screen;
+    var ua=navigator.userAgent.toLowerCase();
+
+    if(window.devicePixelRatio !== undefined){
+        ratio=window.devicePixelRatio;    
+    }else if(~ua.indexOf('msie')){
+        if(screen.deviceXDPI && screen.logicalXDPI)
+        {
+            ratio=screen.deviceXDPI/screen.logicalXDPI;        
+        }
+    }else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
+        ratio=window.outerWidth/window.innerWidth;
+    }
+
+    if(ratio){
+        ratio=Math.round(ratio*100);    
+    }
+    
+    return ratio;
+}
+
+function ChangeRatio(type){
+    var ratio=0;
+    var screen=window.screen;
+    var ua=navigator.userAgent.toLowerCase();
+
+    if(window.devicePixelRatio !== undefined){
+        ratio=window.devicePixelRatio;    
+    }else if(~ua.indexOf('msie')){
+        if(screen.deviceXDPI && screen.logicalXDPI)
+        {
+            ratio=screen.deviceXDPI/screen.logicalXDPI;        
+        }
+    }else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
+        ratio=window.outerWidth/window.innerWidth;
+    }
+
+    if(ratio){
+        ratio=Math.round(ratio*100);    
+    }
+
+    var value;
+    if(type == 'width'){
+        var width = window.screen.width;
+        if(isIE()){
+            value = width*ratio/100;
+        }else {
+            value = width;
+        }
+    }else {
+        var height = window.screen.height;
+        if(isIE()){
+            value = height*ratio/100;
+        }else {
+            value = height;
+        }
+    }
+    
+    return parseInt(value);
+}
 	
 $(document).ready(function() {
     if (notInWhiteList(sstsConfig, 'tousseSplitRecycle')) {
@@ -253,6 +338,159 @@
     $('#remark').click(function(){
     	openInputRemark();
     });
+
+    var screenWidth = ChangeRatio('width');
+	var screenHeight = ChangeRatio('height');
+    
+    $('.mbody').css('width','100%');
+    
+	if(screenWidth < 1030){
+        var height = 800;
+        var bottom = 70;
+        if(source == ''){
+            height = 770;
+            bottom = 100;
+        }
+        $('.mbody').css({'width':'1920px'});
+        $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
+        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
+        $('.add-form .remark,.add-form .communicationUserName').css({'top':'120px'});
+        $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'170px'});
+        $('#divElement').css({'margin-top':'250px','right':'180px'});
+
+        $('.data-table').css({'left':'40px','bottom':bottom+'px','height':height+'px'});
+        $('#tousseItemBox').css({'height':(height-80)+'px'});
+        $('.zhuangzai-table').css({'height':'1040px','bottom':'80px','right':'55px','width':'610px'});
+        if(isIE()){
+            $('.mbody').css({'zoom':0.5078*(105/getRatio())});
+		}
+    }else if(screenWidth>1270 && screenWidth<1300){
+        if(screenHeight<730){
+            var height = 540;
+            var bottom = 90;
+            if(source == ''){
+                height = 510;
+                bottom = 120;
+            }
+            $('.mbody').css({'width':'2030px'});
+            $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
+            $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
+            $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
+            $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
+            $('#divElement').css({'margin-top':'250px'});
+
+            $('.data-table').css({'left':'40px','bottom':bottom+'px','height':height+'px','width':'1230px'});
+            $('#tousseItemBox').css({'height':(height-80)+'px'});
+            $('.zhuangzai-table').css({'height':(height+200)+'px','bottom':'90px','width':'650px'});
+            
+            if(isIE()){
+                $('.mbody').css('zoom',0.6*(105/getRatio()));
+            }
+        }else if(screenHeight>790 && screenHeight<810){
+            $('.mbody').css({'width':'1920px'});
+            $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
+            $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
+            $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
+            $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
+            $('#divElement').css({'margin-top':'250px','right':'180px'});
+
+            $('.data-table').css({'left':'40px','bottom':'55px','height':'580px'});
+            $('#tousseItemBox').css({'height':'500px'});
+            $('.zhuangzai-table').css({'height':'820px','bottom':'55px','right': '50px'});
+            
+            if(isIE()){
+                $('.mbody').css({'zoom':0.6348*(105/getRatio())});
+            }
+        }else {
+            var height = 935;
+            var bottom = 80;
+            if(source == ''){
+                height = 905;
+                bottom = 110;
+            }
+            $('.mbody').css({'width':'1920px','height':'1460px'});
+            $('.add-form').css({'top':'45px'});
+            $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'40px'});
+            $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'120px'});
+            $('.add-form .remark,.add-form .communicationUserName').css({'top':'200px'});
+            $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'240px'});
+            $('#divElement').css({'margin-top':'325px','right':'180px'});
+
+            $('.data-table').css({'left':'30px','bottom':bottom+'px','height':height+'px'});
+            $('#tousseItemBox').css({'height':(height-80)+'px'});
+            $('.zhuangzai-table').css({'height':(height+200)+'px','bottom':'85px','right': '50px'});
+            if(isIE()){
+                $('.mbody').css('zoom',0.6348*(105/getRatio()));
+            }
+        }
+	}else if(screenWidth>1350 && screenWidth<1370){
+        var height = 550;
+        var bottom = 80;
+        if(source == ''){
+            height = 520;
+            bottom = 110;
+        }
+        $('.mbody').css({'width':'2030px'});
+		$('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
+        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
+        $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
+        $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
+        $('#divElement').css({'margin-top':'250px'});
+
+        $('.data-table').css({'left':'40px','bottom':bottom+'px','height':height+'px','width':'1230px'});
+        $('#tousseItemBox').css({'height':(height-80)+'px'});
+		$('.zhuangzai-table').css({'height':(height+200)+'px','bottom':'100px','right': '75px'});
+        
+        if(isIE()){
+            $('.mbody').css('zoom',0.6416*(105/getRatio()));
+		}
+    }else if(screenWidth>1390 && screenWidth<1450){
+        var height = 580;
+        $('.mbody').css({'width':'1920px'});
+		$('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
+        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
+        $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
+        $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
+        $('#divElement').css({'margin-top':'255px','right':'180px'});
+
+        $('.data-table').css({'left':'40px','bottom':'50px','height':height+'px'});
+        $('#tousseItemBox').css({'height':(height-80)+'px'});
+		$('.zhuangzai-table').css({'height':(height+260)+'px','bottom':'70px','right': '50px'});
+        
+        if(isIE()){
+            $('.mbody').css({'zoom':0.714*(105/getRatio())});
+		}
+    }else if(screenWidth>1590 && screenWidth<1610){
+        var height = 570;
+        if(source == ''){
+            height = 540;
+        }
+        $('.mbody').css({'width':'2010px','height':(height+510)+'px'});
+		$('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
+        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
+        $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
+        $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
+        $('#divElement').css({'margin-top':'250px'});
+
+        $('.data-table').css({'left':'30px','bottom':'70px','height':height+'px','width':'1220px'});
+        $('#tousseItemBox').css({'height':(height-80)+'px'});
+        $('.zhuangzai-table').css({'height':(height+200)+'px','bottom':'100px','right': '75px'});
+        if(isIE()){
+            $('.mbody').css('zoom',0.7583*(105/getRatio()));
+		}
+    }else if(screenWidth>1910 && screenWidth<1930){
+        var height = 570;
+        if(source == ''){
+            height = 540;
+        }
+        $('.mbody').css({'width':'1994px'});
+        $('.data-table').css({'left':'55px','bottom':'60px','height':height+'px','width':'1190px'});
+        $('#tousseItemBox').css({'height':(height-80)+'px'});
+        $('#divElement').css({'margin-top':'250px','right':'150px'});
+        if(isIE()){
+            $('.mbody').css('zoom',0.9166*(105/getRatio()));
+		}
+    }
 });
 var newTimer = null;
 function newAlert(msg){
@@ -474,228 +712,6 @@
 <video id="recycleAudioAmount2" src=""></video>   
 <![endif]-->
 </body>
-<script>
-    function isIE(value) {
-		var vals = value || '';
-		if(!!window.ActiveXObject || "ActiveXObject" in window){
-			if(vals !== ''){
-				var DEFAULT_VERSION = 8.0;  
-				var ua = navigator.userAgent.toLowerCase();
-				var safariVersion = ua.match(/msie ([\d.]+)/) || ''; 
-				if(safariVersion == ''){
-					return false;
-				}
-				if(safariVersion[1] <= DEFAULT_VERSION ){  
-					return true;
-				}else {
-					return false;
-				}
-			}
-
-			return true;
-		}else{
-			return false;
-	　　 }
-    }
-    
-    function getRatio(){
-        var ratio=0;
-        var ratio=0;
-		var screen=window.screen;
-		var ua=navigator.userAgent.toLowerCase();
-
-		if(window.devicePixelRatio !== undefined){
-			ratio=window.devicePixelRatio;    
-		}else if(~ua.indexOf('msie')){
-			if(screen.deviceXDPI && screen.logicalXDPI)
-			{
-				ratio=screen.deviceXDPI/screen.logicalXDPI;        
-			}
-		}else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
-			ratio=window.outerWidth/window.innerWidth;
-		}
-
-		if(ratio){
-			ratio=Math.round(ratio*100);    
-        }
-        
-        return ratio;
-    }
-
-    function ChangeRatio(type){
-		var ratio=0;
-		var screen=window.screen;
-		var ua=navigator.userAgent.toLowerCase();
-
-		if(window.devicePixelRatio !== undefined){
-			ratio=window.devicePixelRatio;    
-		}else if(~ua.indexOf('msie')){
-			if(screen.deviceXDPI && screen.logicalXDPI)
-			{
-				ratio=screen.deviceXDPI/screen.logicalXDPI;        
-			}
-		}else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
-			ratio=window.outerWidth/window.innerWidth;
-		}
-
-		if(ratio){
-			ratio=Math.round(ratio*100);    
-		}
-
-		var value;
-		if(type == 'width'){
-			var width = window.screen.width;
-			if(isIE()){
-				value = width*ratio/100;
-			}else {
-				value = width;
-			}
-		}else {
-			var height = window.screen.height;
-			if(isIE()){
-				value = height*ratio/100;
-			}else {
-				value = height;
-			}
-		}
-		
-		return parseInt(value);
-    }
-    
-    var screenWidth = ChangeRatio('width');
-	var screenHeight = ChangeRatio('height');
-    
-    $('.mbody').css('width','100%');
-    
-	if(screenWidth < 1030){
-        $('.mbody').css({'width':'1920px'});
-        $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
-        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
-        $('.add-form .remark,.add-form .communicationUserName').css({'top':'120px'});
-        $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'170px'});
-        $('#divElement').css({'margin-top':'250px','right':'180px'});
-
-        $('.data-table').css({'left':'40px','bottom':'70px','height':'800px'});
-        $('#tousseItemBox').css({'height':'720px'});
-        $('.zhuangzai-table').css({'height':'1040px','bottom':'80px','right':'55px','width':'610px'});
-        if(isIE()){
-            $('.mbody').css({'height':'1350px','zoom':0.5078*(105/getRatio())});
-            $('.data-table').css({'left':'40px','bottom':'70px','height':'840px'});
-            $('.zhuangzai-table').css({'height':'1040px','bottom':'100px','right':'55px','width':'610px'});
-		}
-    }else if(screenWidth>1270 && screenWidth<1300){
-        if(screenHeight<730){
-            $('.mbody').css({'width':'2030px'});
-            $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
-            $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
-            $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
-            $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
-            $('#divElement').css({'margin-top':'250px'});
-
-            $('.data-table').css({'left':'40px','bottom':'90px','height':'540px','width':'1230px'});
-            $('#tousseItemBox').css({'height':'460px'});
-            $('.zhuangzai-table').css({'height':'780px','bottom':'90px','width':'650px'});
-            
-            if(isIE()){
-                $('.mbody').css('zoom',0.6*(105/getRatio()));
-                $('.data-table').css({'left':'40px','bottom':'90px','height':'540px','width':'1230px'});
-                $('#tousseItemBox').css({'height':'460px'});
-            }
-        }else if(screenHeight>790 && screenHeight<810){
-            $('.mbody').css({'width':'1920px'});
-            $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
-            $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
-            $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
-            $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
-            $('#divElement').css({'margin-top':'250px','right':'180px'});
-
-            $('.data-table').css({'left':'40px','bottom':'55px','height':'580px'});
-            $('#tousseItemBox').css({'height':'500px'});
-            $('.zhuangzai-table').css({'height':'820px','bottom':'55px','right': '50px'});
-            
-            if(isIE()){
-                $('.mbody').css({'height':'1130px','zoom':0.6348*(105/getRatio())});
-                $('.data-table').css({'left':'40px','height':'600px'});
-                $('#tousseItemBox').css({'height':'520px'});
-                $('.zhuangzai-table').css({'height':'850px','bottom':'60px','right': '50px'});
-                $('#divElement').css({'margin-top':'270px','right':'180px'});
-            }
-        }else {
-            $('.mbody').css({'width':'1920px','height':'1460px'});
-            $('.add-form').css({'top':'45px'});
-            $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'40px'});
-            $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'120px'});
-            $('.add-form .remark,.add-form .communicationUserName').css({'top':'200px'});
-            $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'240px'});
-            $('#divElement').css({'margin-top':'325px','right':'180px'});
-
-            $('.data-table').css({'left':'30px','bottom':'80px','height':'935px'});
-            $('#tousseItemBox').css({'height':'855px'});
-            $('.zhuangzai-table').css({'height':'1175px','bottom':'85px','right': '50px'});
-            if(isIE()){
-                $('.mbody').css('zoom',0.6348*(105/getRatio()));
-            }
-        }
-	}else if(screenWidth>1350 && screenWidth<1370){
-        $('.mbody').css({'width':'2030px'});
-		$('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
-        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
-        $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
-        $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
-        $('#divElement').css({'margin-top':'250px'});
-
-        $('.data-table').css({'left':'40px','bottom':'80px','height':'550px','width':'1230px'});
-        $('#tousseItemBox').css({'height':'470px'});
-		$('.zhuangzai-table').css({'height':'770px','bottom':'100px','right': '75px'});
-        
-        if(isIE()){
-			$('.data-table').css({'left':'40px','bottom':'60px','height':'570px','width':'1230px'});
-            $('#tousseItemBox').css({'height':'490px'});
-            $('.mbody').css('zoom',0.6416*(105/getRatio()));
-		}
-    }else if(screenWidth>1390 && screenWidth<1450){
-        $('.mbody').css({'width':'1920px'});
-		$('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
-        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
-        $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
-        $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
-        $('#divElement').css({'margin-top':'255px','right':'180px'});
-
-        $('.data-table').css({'left':'40px','bottom':'50px','height':'580px'});
-        $('#tousseItemBox').css({'height':'500px'});
-		$('.zhuangzai-table').css({'height':'820px','bottom':'70px','right': '50px'});
-        
-        if(isIE()){
-            $('.mbody').css({'height':'1130px','zoom':0.714*(105/getRatio())});
-            $('.data-table').css({'left':'40px','height':'600px'});
-            $('#tousseItemBox').css({'height':'520px'});
-            $('.zhuangzai-table').css({'height':'850px','bottom':'60px','right': '50px'});
-            $('#divElement').css({'margin-top':'270px','right':'180px'});
-		}
-    }else if(screenWidth>1590 && screenWidth<1610){
-        $('.mbody').css({'width':'2010px','height':'1080px'});
-		$('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'-30px'});
-        $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'40px'});
-        $('.add-form .remark,.add-form .communicationUserName').css({'top':'110px'});
-        $('.add-form .add,.add-form .add2').css({'margin-top':'170px'});
-        $('#divElement').css({'margin-top':'250px'});
-
-        $('.data-table').css({'left':'30px','bottom':'70px','height':'570px','width':'1220px'});
-        $('#tousseItemBox').css({'height':'490px'});
-        $('.zhuangzai-table').css({'height':'770px','bottom':'100px','right': '75px'});
-        if(isIE()){
-            $('.mbody').css('zoom',0.7583*(105/getRatio()));
-		}
-    }else if(screenWidth>1910 && screenWidth<1930){
-        $('.mbody').css({'width':'1994px'});
-        $('.data-table').css({'left':'55px','bottom':'60px','height':'570px','width':'1190px'});
-        $('#tousseItemBox').css({'height':'490px'});
-        $('#divElement').css({'margin-top':'250px','right':'150px'});
-        if(isIE()){
-            $('.mbody').css('zoom',0.9166*(105/getRatio()));
-		}
-    }
-</script>
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
 	<jsp:param value="<%=Workstation.TRIGGERMODULE_RECYCLING %>" name="module"/>
 </jsp:include>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r27858 -r27876
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 27858)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 27876)
@@ -22,6 +22,7 @@
 <title>回收清点</title>
 <script type="text/javascript">
 var WWWROOT = '${ctx}';
+var source = '${param.source}';
 //扫描篮筐允许的篮筐状态集合
 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 
@@ -344,12 +345,12 @@
 
 function recycleTheApplication(id,barcode){
 	var rememberRecycleUser= CookieManager.getCookie("rememberRecycleUser");
-    location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&recyclingApplicationId="+id+"&barcode="+barcode+"&rememberRecycleUser=" + rememberRecycleUser;
+    location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&recyclingApplicationId="+id+"&barcode="+barcode+"&rememberRecycleUser=" + rememberRecycleUser+'&source='+source;
 }
 
 function openHistoryRecyclingRecord(id){
 	var rememberRecycleUser= CookieManager.getCookie("rememberRecycleUser");
-    location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&id="+id + "&recordType=" + "history&rememberRecycleUser=" + rememberRecycleUser;   //添加recordType,表示是历史记录
+    location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&id="+id + "&recordType=" + "history&rememberRecycleUser=" + rememberRecycleUser+'&source='+source;   //添加recordType,表示是历史记录
 }
 
 /**
@@ -360,7 +361,7 @@
 	var departCoding = isUndefinedOrNullOrEmpty(departCoding)?"":departCoding;
 	var rememberRecycleUser= CookieManager.getCookie("rememberRecycleUser");
 	location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&rememberRecycleUser=" 
-			+ rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding;
+			+ rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding+'&source='+source;
 }
 
 function cancel(){
@@ -1880,15 +1881,114 @@
 	.wait_item .scroll,.his_item .scroll {
 		width: 100%;
 	}
+	body, html {
+		height: 100%;
+	}
 </style>
 </body>
 <script>
 	$(document).ready(function(){
 		if(isUndefinedOrNull(printConfig.recyclingItems)){
-				$(".recycleListPrint").hide();
+			$(".recycleListPrint").hide();
 		}
+		var screenWidth = ChangeRatio('width');
+		var screenHeight = ChangeRatio('height');
+		if(screenWidth < 1030){
+			var height = 1130;
+			if(source == ''){
+				height = 1100;
+			}
+			$('.wait_item,.his_item').css({'height':height+'px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-160)+'px'});
+			$('.wait_item .sum,.his_item .page').css('bottom','0px');
+			$('.mbody_02').css('width','1920px');
+			if(isIE()){
+				$('.mbody_02').css({'zoom':0.507*(105/getRatio()),'height':(height+180)+'px'});
+				$('.wait_item,.his_item').css({'height':(height-50)+'px','top':'160px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-210)+'px'});
+			}
+		}else if(screenWidth>1270 && screenWidth<1300){
+			if(screenHeight<730){
+				var height = 860;
+				if(source == ''){
+					height = 830;
+				}
+				$('.wait_item,.his_item').css({'height':height+'px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-160)+'px'});
+				$('.wait_item .sum,.his_item .page').css('bottom','0px');
+				$('.mbody_02').css('width','2030px');
+				if(isIE()){
+					$('.mbody_02').css({'zoom':0.6*(105/getRatio()),'height':'1080px'});
+				}
+			}else if(screenHeight>790 && screenHeight<810){
+				$('.wait_item,.his_item').css({'height':'900px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':'740px'});
+				$('.wait_item .sum,.his_item .page').css('bottom','10px');
+				$('.mbody_02').css('width','1920px');
+				if(isIE()){
+					$('.mbody_02').css({'zoom':0.634*(105/getRatio())});
+				}
+			}else {
+				var height = 1270;
+				if(source == ''){
+					height = 1240;
+				}
+				$('.wait_item,.his_item').css({'height':height+'px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':(height-160)+'px'});
+				$('.wait_item .sum,.his_item .page').css('bottom','10px');
+				$('.mbody_02').css('width','1920px');
+				if(isIE()){
+					$('.mbody_02').css({'zoom':0.634*(105/getRatio()),'height':'1460px'});
+					$('.wait_item,.his_item').css({'height':(height-60)+'px','top':'190px'});
+					$('.wait_item .scroll,.his_item .scroll').css({'height':(height-220)+'px'});
+				}
+			}
+		}else if(screenWidth>1350 && screenWidth<1370){
+			var height = 870;
+			if(source == ''){
+				height = 840;
+			}
+			$('.wait_item,.his_item').css({'height':height+'px','top': '130px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-160)+'px'});
+			$('.wait_item .sum,.his_item .page').css('bottom','0px');
+			$('.mbody_02').css({'width':'2025px'});
+			if(isIE()){
+				$('.mbody_02').css('zoom',0.641*(105/getRatio()));
+			}
+		}else if(screenWidth>1390 && screenWidth<1450){
+			$('.wait_item,.his_item').css({'height':'890px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
+			$('.wait_item .sum,.his_item .page').css('bottom','0px');
+			$('.mbody_02').css({'width':'1920px'});
+			if(isIE()){
+				$('.mbody_02').css({'zoom':0.715*(105/getRatio()),'height':'1100px'});
+			}
+		}else if(screenWidth>1590 && screenWidth<1610){
+			var height = 890;
+			if(source == ''){
+				height = 860;
+			}
+			$('.wait_item,.his_item').css({'height':height+'px','top':'130px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-160)+'px'});
+			$('.wait_item .sum,.his_item .page').css('bottom','0px');
+			$('.mbody_02').css('width','2010px');
+			if(isIE()){
+				$('.mbody_02').css('zoom',0.76*(105/getRatio()));
+			}
+		}else if(screenWidth>1910 && screenWidth<1930){
+			var height = 890;
+			if(source == ''){
+				height = 860;
+			}
+			$('.wait_item,.his_item').css({'height':height+'px','top':'130px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':(height-160)+'px'});
+			$('.wait_item .sum,.his_item .page').css('bottom','0px');
+			$('.mbody_02').css('width','2000px');
+			if(isIE()){
+				$('.mbody_02').css('zoom',0.915*(105/getRatio()));
+			}
+		}
 	})
-	
 	var voluntarilyUrgentItems = '${param.voluntarilyUrgentItems}';
 	if (voluntarilyUrgentItems) {
 		var obj = new Object();
@@ -1983,79 +2083,6 @@
 		
 		return parseInt(value);
 	}
-	var screenWidth = ChangeRatio('width');
-	var screenHeight = ChangeRatio('height');
-	if(screenWidth < 1030){
-		$('.wait_item,.his_item').css({'height':'1130px'});
-		$('.wait_item .scroll,.his_item .scroll').css({'height':'970px'});
-		$('.wait_item .sum,.his_item .page').css('bottom','0px');
-		$('.mbody_02').css('width','1920px');
-		if(isIE()){
-			$('.mbody_02').css({'zoom':0.507*(105/getRatio()),'height':'1310px'});
-		}
-	}else if(screenWidth>1270 && screenWidth<1300){
-		if(screenHeight<730){
-			$('.wait_item,.his_item').css({'height':'860px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':'700px'});
-			$('.wait_item .sum,.his_item .page').css('bottom','0px');
-			$('.mbody_02').css('width','2030px');
-			if(isIE()){
-				$('.mbody_02').css({'zoom':0.6*(105/getRatio()),'height':'1080px'});
-			}
-		}else if(screenHeight>790 && screenHeight<810){
-			$('.wait_item,.his_item').css({'height':'900px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':'740px'});
-			$('.wait_item .sum,.his_item .page').css('bottom','10px');
-			$('.mbody_02').css('width','1920px');
-			if(isIE()){
-				$('.wait_item,.his_item').css({'height':'930px','top':'130px'});
-				$('.wait_item .scroll,.his_item .scroll').css({'height':'770px'});
-				$('.mbody_02').css({'zoom':0.634*(105/getRatio()),'height':'1110px'});
-			}
-		}else {
-			$('.wait_item,.his_item').css({'height':'1270px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':'1100px'});
-			$('.wait_item .sum,.his_item .page').css('bottom','10px');
-			$('.mbody_02').css('width','1920px');
-			if(isIE()){
-				$('.mbody_02').css({'zoom':0.634*(105/getRatio()),'height':'1460px'});
-			}
-		}
-	}else if(screenWidth>1350 && screenWidth<1370){
-		$('.wait_item,.his_item').css({'height':'870px','top': '130px'});
-		$('.wait_item .scroll,.his_item .scroll').css({'height':'710px'});
-		$('.wait_item .sum,.his_item .page').css('bottom','0px');
-		$('.mbody_02').css({'width':'2025px'});
-		if(isIE()){
-			$('.mbody_02').css('zoom',0.641*(105/getRatio()));
-		}
-	}else if(screenWidth>1390 && screenWidth<1450){
-		$('.wait_item,.his_item').css({'height':'890px'});
-		$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
-		$('.wait_item .sum,.his_item .page').css('bottom','0px');
-		$('.mbody_02').css({'width':'1920px'});
-		if(isIE()){
-			$('.wait_item,.his_item').css({'height':'940px','top':'135px'});
-			$('.wait_item .scroll,.his_item .scroll').css({'height':'780px'});
-			$('.mbody_02').css({'zoom':0.715*(105/getRatio()),'height':'1140px'});
-		}
-	}else if(screenWidth>1590 && screenWidth<1610){
-		$('.wait_item,.his_item').css({'height':'890px','top':'130px'});
-		$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
-		$('.wait_item .sum,.his_item .page').css('bottom','0px');
-		$('.mbody_02').css('width','2010px');
-		if(isIE()){
-			$('.mbody_02').css('zoom',0.76*(105/getRatio()));
-		}
-	}else if(screenWidth>1910 && screenWidth<1930){
-		$('.wait_item,.his_item').css({'height':'890px','top':'130px'});
-		$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
-		$('.wait_item .sum,.his_item .page').css('bottom','0px');
-		$('.mbody_02').css('width','2000px');
-		if(isIE()){
-			$('.mbody_02').css('zoom',0.915*(105/getRatio()));
-		}
-	}
 </script>
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
 	<jsp:param value="<%=Workstation.TRIGGERMODULE_RECYCLING %>" name="module"/>