Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r27772 -r27782
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 27772)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 27782)
@@ -1721,7 +1721,7 @@
 
 <style>
 	.mbody_02 {
-		width: 100%;
+		width: 1980px;
 		background: none;
 		margin-left: 0 !important;
 	}
@@ -1904,105 +1904,114 @@
 	　　 }
 	}
 
-	var screenWidth = window.screen.width;
-	var screenHeight = window.screen.height;
+	function ChangeRatio(type){
+		var ratio=0;
+		var screen=window.screen;
+		var ua=navigator.userAgent.toLowerCase();
 
-	if(screenWidth == 1024){
-		$('.wait_item').css({'height':'1115px'});
-		$('.wait_item .scroll').css({'height':'950px'});
-		$('.wait_item .sum').css('bottom','0px');
-		$('.his_item').css('height','1115px');
-		$('.his_item .scroll').css('height','950px');
-		$('.his_item .page').css('bottom','0px');
-
-		if(isIE()){
-			$('.mbody_02').css('width','188%')
+		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;
 		}
-	}else if(screenWidth == 1280 && screenHeight == 720){
-		$('.wait_item').css({'height':'850px'});
-		$('.wait_item .scroll').css({'height':'680px'});
-		$('.wait_item .sum').css('bottom','0px');
-		$('.his_item').css('height','850px');
-		$('.his_item .scroll').css('height','680px');
-		$('.his_item .page').css('bottom','0px');
 
-		if(isIE()){
-			$('.mbody_02').css('width','159%');
-			$('.his_item .page').css('bottom','-30px');
-			$('.wait_item .sum').css('bottom','-30px');
+		if(ratio){
+			ratio=Math.round(ratio*100);    
 		}
-	}else if(screenWidth == 1280 && screenHeight == 800){
-		$('.wait_item').css({'height':'900px'});
-		$('.wait_item .scroll').css({'height':'730px'});
-		$('.wait_item .sum').css('bottom','10px');
-		$('.his_item').css('height','900px');
-		$('.his_item .scroll').css('height','730px');
-		$('.his_item .page').css('bottom','10px');
 
-		if(isIE()){
-			$('.mbody_02').css('width','150%')
+		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;
+			}
 		}
-	}else if(screenWidth == 1360 || screenWidth == 1366){
-		$('.wait_item').css({'height':'855px'});
-		$('.wait_item .scroll').css({'height':'680px'});
-		$('.wait_item .sum').css('bottom','0px');
-		$('.his_item').css('height','855px');
-		$('.his_item .scroll').css('height','680px');
-		$('.his_item .page').css('bottom','0px');
+		
+		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');
+	}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()){
+				$('.wait_item,.his_item').css({'height':'890px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
+			}
+		}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({'height':'1140px'});
+				$('.wait_item,.his_item').css({'height':'940px','top':'138px'});
+				$('.wait_item .scroll,.his_item .scroll').css({'height':'780px'});
+				$('.wait_item .sum,.his_item .page').css('bottom','0px');
+			}
+		}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');
+		}
+	}else if(screenWidth>1350 && screenWidth<1370){
+		$('.wait_item,.his_item').css({'height':'870px'});
+		$('.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('width','149%');
-			$('.his_item .page').css('bottom','-20px');
-			$('.wait_item .sum').css('bottom','-20px');
+			$('.wait_item,.his_item').css({'height':'890px'});
 		}
-	}else if(screenWidth == 1440 || screenWidth == 1400){
-		$('.wait_item').css({'height':'890px'});
-		$('.wait_item .scroll').css({'height':'735px'});
-		$('.wait_item .sum').css('bottom','0px');
-		$('.his_item').css('height','890px');
-		$('.his_item .scroll').css('height','735px');
-		$('.his_item .page').css('bottom','0px');
-
+	}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({'width':'134%','height':'1140px'});
+			$('.mbody_02').css({'height':'1140px'});
 			$('.wait_item,.his_item').css({'height':'920px','top':'138px'});
 			$('.wait_item .scroll,.his_item .scroll').css({'height':'780px'});
-			$('.his_item .page').css('bottom','-20px');
-			$('.wait_item .sum').css('bottom','-20px');
+			$('.wait_item .sum,.his_item .page').css('bottom','-20px');
 		}
-	}else if(screenWidth == 1600 && screenHeight == 900){
-		$('.wait_item').css({'height':'870px'});
-		$('.wait_item .scroll').css({'height':'695px'});
-		$('.wait_item .sum').css('bottom','0px');
-		$('.his_item').css('height','870px');
-		$('.his_item .scroll').css('height','695px');
-		$('.his_item .page').css('bottom','0px');
-
+	}else if(screenWidth>1590 && screenWidth<1610){
+		$('.wait_item,.his_item').css({'height':'870px'});
+		$('.wait_item .scroll,.his_item .scroll').css({'height':'710px'});
+		$('.wait_item .sum,.his_item .page').css('bottom','0px');
+		$('.mbody_02').css('width','2010px');
 		if(isIE()){
-			$('.mbody_02').css('width','126%')
+			$('.wait_item,.his_item').css({'height':'890px'});
+			$('.wait_item .scroll,.his_item .scroll').css({'height':'730px'});
 		}
-	}else if(screenWidth == 1280 && screenHeight == 1024){
-		$('.wait_item').css({'height':'1250px'});
-		$('.wait_item .scroll').css({'height':'1075px'});
-		$('.wait_item .sum').css('bottom','10px');
-		$('.his_item').css('height','1120px');
-		$('.his_item .scroll').css('height','1080px');
-		$('.his_item .page').css('bottom','-120px');
-
-		if(isIE()){
-			$('.mbody_02').css('width','150%')
-		}
-	}else if(screenWidth == 1920 && screenHeight == 1080){
-		$('.wait_item').css({'height':'880px'});
-		$('.wait_item .scroll').css({'height':'700px'});
-		$('.wait_item .sum').css('bottom','0px');
-		$('.his_item').css('height','880px');
-		$('.his_item .scroll').css('height','700px');
-		$('.his_item .page').css('bottom','0px');
-
-		if(isIE()){
-			$('.mbody_02').css('width','104%')
-		}
+	}else if(screenWidth>1910 && screenWidth<1930){
+		$('.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','2000px');
 	}
 </script>
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r27769 -r27782
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 27769)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 27782)
@@ -188,116 +188,167 @@
 </div>
 </body>
 <script>
-    var screenWidth = window.screen.width;
-    var screenHeight = window.screen.height;
-
     function isIE() {
 		if(!!window.ActiveXObject || "ActiveXObject" in window){
 		return true;
 		}else{
 		return false;
 	　　 }
-	}
+    }
     
-	if(screenWidth == 1024){
-        $('.data-table').css({'width':'1540px','height':'1120px','bottom':'80px','left':'56px'});
-        $('.data-table .box').css({'height':'1020px'});
-        $('#tousseItemTable').css({'width':'1500px'});
-        $('.zhuangzai-table').css({'width':'820px','height':'1070px','bottom':'90px','right':'80px'});
+    function ChangeRatio(type){
+		var ratio=0;
+		var screen=window.screen;
+		var ua=navigator.userAgent.toLowerCase();
 
-        if(isIE()){
-            $('.mbody').css('width','100%');
-            $('.data-table').css({'width':'600px','height':'410px','bottom':'40px','left':'25px'});
-            $('.data-table .box').css({'height':'320px'});
-            $('#tousseItemTable').css({'width':'580px'});
-            $('.zhuangzai-table').css({'width':'320px','height':'430px','bottom':'45px','right':'30px'});
+		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;
 		}
-	}else if(screenWidth == 1280 && screenHeight == 720){
-		$('.data-table').css({'width':'1630px','height':'860px','bottom':'80px','left':'56px'});
-        $('.data-table .box').css({'height':'770px'});
-        $('#tousseItemTable').css({'width':'1570px'});
-        $('.zhuangzai-table').css({'width':'880px','height':'820px','bottom':'90px','right':'80px'});
 
-        if(isIE()){
-            $('.mbody').css('width','100%');
-            $('.data-table').css({'width':'750px','height':'410px','bottom':'40px','left':'40px'});
-            $('.data-table .box').css({'height':'320px'});
-            $('#tousseItemTable').css({'width':'730px'});
-            $('.zhuangzai-table').css({'width':'410px','height':'400px','bottom':'40px','right':'40px'});
+		if(ratio){
+			ratio=Math.round(ratio*100);    
 		}
-	}else if(screenWidth == 1280 && screenHeight == 800){
-		$('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
-        $('.data-table .box').css({'height':'830px'});
+
+		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':'2600px','height':'1717px'});
+        $('.data-table').css({'width':'1540px','height':'1110px','bottom':'100px','left':'56px'});
+        $('.data-table .box').css({'height':'1030px'});
         $('#tousseItemTable').css({'width':'1520px'});
-        $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
+        $('.zhuangzai-table').css({'width':'820px','height':'1100px','bottom':'90px','right':'80px'});
 
         if(isIE()){
-            $('.mbody').css('width','100%');
-            $('.data-table').css({'width':'750px','height':'440px','bottom':'50px','left':'40px'});
-            $('.data-table .box').css({'height':'350px'});
-            $('#tousseItemTable').css({'width':'730px'});
-            $('.zhuangzai-table').css({'width':'410px','height':'470px','bottom':'45px','right':'40px'});
+            $('.mbody').css({'width':'1080px','height':'750px'});
+            $('.data-table').css({'width':'650px','height':'500px','bottom':'40px','left':'25px'});
+            $('.data-table .box').css({'height':'420px'});
+            $('#tousseItemTable').css({'width':'630px'});
+            $('.zhuangzai-table').css({'width':'320px','height':'460px','bottom':'45px','right':'30px'});
 		}
-	}else if(screenWidth == 1366 || screenWidth == 1360){
-		$('.data-table').css({'width':'1620px','height':'860px','bottom':'90px','left':'56px'});
-        $('.data-table .box').css({'height':'770px'});
-        $('#tousseItemTable').css({'width':'1600px'});
-        $('.zhuangzai-table').css({'width':'875px','height':'820px','bottom':'90px','right':'80px'});
+	}else if(screenWidth>1270 && screenWidth<1300){
+        if(screenHeight<730){
+            $('.mbody').css({'width':'2750px','height':'1350px'});
+            $('.data-table').css({'width':'1630px','height':'860px','bottom':'80px','left':'56px'});
+            $('.data-table .box').css({'height':'780px'});
+            $('#tousseItemTable').css({'width':'1610px'});
+            $('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'});
 
+            if(isIE()){
+                $('.mbody').css({'width':'1360px','height':'720px'});
+                $('.data-table').css({'width':'800px','height':'450px','bottom':'40px','left':'40px'});
+                $('.data-table .box').css({'height':'370px'});
+                $('#tousseItemTable').css({'width':'780px'});
+                $('.zhuangzai-table').css({'width':'440px','height':'450px','bottom':'40px','right':'40px'});
+            }
+        }else if(screenHeight>790 && screenHeight<810){
+            $('.mbody').css({'width':'2600px','height':'1420px'});
+            $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
+            $('.data-table .box').css({'height':'840px'});
+            $('#tousseItemTable').css({'width':'1520px'});
+            $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
+
+            if(isIE()){
+                $('.mbody').css({'width':'1350px','height':'800px'});
+                $('.data-table').css({'width':'800px','height':'510px','bottom':'40px','left':'40px'});
+                $('.data-table .box').css({'height':'430px'});
+                $('#tousseItemTable').css({'width':'780px'});
+                $('.zhuangzai-table').css({'width':'430px','height':'510px','bottom':'45px','right':'40px'});
+            }
+        }else {
+            $('.mbody').css({'width':'2600px','height':'1900px'});
+            $('.data-table').css({'width':'1550px','height':'1240px','bottom':'120px','left':'56px'});
+            $('.data-table .box').css({'height':'1160px'});
+            $('#tousseItemTable').css({'width':'1530px'});
+            $('.zhuangzai-table').css({'width':'840px','height':'1200px','bottom':'115px','right':'70px'});
+
+            if(isIE()){
+                $('.mbody').css({'width':'1350px','height':'1030px'});
+                $('.data-table').css({'width':'800px','height':'670px','bottom':'50px','left':'40px'});
+                $('.data-table .box').css({'height':'590px'});
+                $('#tousseItemTable').css({'width':'780px'});
+                $('.zhuangzai-table').css({'width':'440px','height':'650px','bottom':'60px','right':'35px'});
+            }
+        }
+	}else if(screenWidth>1350 && screenWidth<1370){
+        $('.mbody').css({'width':'2745px','height':'1360px'});
+		$('.data-table').css({'width':'1660px','height':'860px','bottom':'90px','left':'56px'});
+        $('.data-table .box').css({'height':'780px'});
+        $('#tousseItemTable').css({'width':'1640px'});
+        $('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'});
+
         if(isIE()){
-            $('.mbody').css('width','100%');
-            $('.data-table').css({'width':'800px','height':'440px','bottom':'50px','left':'56px'});
-            $('.data-table .box').css({'height':'350px'});
-            $('#tousseItemTable').css({'width':'780px'});
-            $('.zhuangzai-table').css({'width':'440px','height':'440px','bottom':'45px','right':'40px'});
+            $('.mbody').css({'width':'1370px','height':'720px'});
+            $('.data-table').css({'width':'810px','height':'460px','bottom':'50px','left':'40px'});
+            $('.data-table .box').css({'height':'380px'});
+            $('#tousseItemTable').css({'width':'790px'});
+            $('.zhuangzai-table').css({'width':'440px','height':'450px','bottom':'45px','right':'40px'});
 		}
-	}else if(screenWidth == 1400 || screenWidth == 1440){
-		$('.data-table').css({'width':'1545px','height':'890px','bottom':'120px','left':'56px'});
-        $('.data-table .box').css({'height':'810px'});
-        $('#tousseItemTable').css({'width':'1525px'});
-        $('.zhuangzai-table').css({'width':'830px','height':'890px','bottom':'90px','right':'80px'});
+	}else if(screenWidth>1390 && screenWidth<1450){
+        $('.mbody').css({'width':'2600px','height':'1460px'});
+		$('.data-table').css({'width':'1560px','height':'930px','bottom':'90px','left':'56px'});
+        $('.data-table .box').css({'height':'850px'});
+        $('#tousseItemTable').css({'width':'1540px'});
+        $('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'});
 
         if(isIE()){
-            $('.mbody').css('width','100%');
+            $('.mbody').css({'width':'1440px','height':'850px'});
             $('.data-table').css({'width':'850px','height':'530px','bottom':'50px','left':'35px'});
             $('.data-table .box').css({'height':'450px'});
             $('#tousseItemTable').css({'width':'780px'});
             $('.zhuangzai-table').css({'width':'460px','height':'530px','bottom':'45px','right':'40px'});
 		}
-	}else if(screenWidth == 1600 && screenHeight == 900){
-		$('.data-table').css({'width':'1620px','height':'835px','bottom':'90px','left':'56px'});
-        $('.data-table .box').css({'height':'780px'});
+	}else if(screenWidth>1590 && screenWidth<1610){
+        $('.mbody').css({'width':'2720px','height':'1353px'});
+		$('.data-table').css({'width':'1620px','height':'900px','bottom':'80px','left':'56px'});
+        $('.data-table .box').css({'height':'820px'});
         $('#tousseItemTable').css({'width':'1600px'});
         $('.zhuangzai-table').css({'width':'875px','height':'835px','bottom':'90px','right':'80px'});
 
         if(isIE()){
-            $('.mbody').css('width','100%');
-            $('.data-table').css({'width':'930px','height':'530px','bottom':'50px','left':'56px'});
-            $('.data-table .box').css({'height':'440px'});
-            $('#tousseItemTable').css({'width':'920px'});
+            $('.mbody').css({'width':'1600px','height':'830px'});
+            $('.data-table').css({'width':'960px','height':'530px','bottom':'50px','left':'40px'});
+            $('.data-table .box').css({'height':'450px'});
+            $('#tousseItemTable').css({'width':'940px'});
             $('.zhuangzai-table').css({'width':'510px','height':'530px','bottom':'50px','right':'50px'});
 		}
-	}else if(screenWidth == 1280 && screenHeight == 1024){
-		$('.data-table').css({'width':'1550px','height':'1240px','bottom':'90px','left':'56px'});
-        $('.data-table .box').css({'height':'1150px'});
-        $('#tousseItemTable').css({'width':'1530px'});
-        $('.zhuangzai-table').css({'width':'840px','height':'1165px','bottom':'115px','right':'70px'});
-
-        if(isIE()){
-            $('.mbody').css('width','100%');
-            $('.data-table').css({'width':'730px','height':'630px','bottom':'40px','left':'50px'});
-            $('.data-table .box').css({'height':'540px'});
-            $('#tousseItemTable').css({'width':'710px'});
-            $('.zhuangzai-table').css({'width':'400px','height':'600px','bottom':'60px','right':'35px'});
-		}
-	}else if(screenWidth == 1920){
-        $('.data-table').css({'width':'1620px','height':'870px','bottom':'90px','left':'56px'});
-        $('.data-table .box').css({'height':'780px'});
+	}else if(screenWidth>1910 && screenWidth<1930){
+        $('.mbody').css({'width':'2677px','height':'1372px'});
+        $('.data-table').css({'width':'1620px','height':'890px','bottom':'80px','left':'56px'});
+        $('.data-table .box').css({'height':'810px'});
         $('#tousseItemTable').css({'width':'1600px'});
         $('.zhuangzai-table').css({'width':'875px','height':'850px','bottom':'90px','right':'75px'});
-
         if(isIE()){
-            $('.mbody').css('width','100%');
+            $('.mbody').css({'width':'1920px','height':'1020px'});
             $('.data-table').css({'width':'1120px','height':'660px','bottom':'50px','left':'56px'});
             $('.data-table .box').css({'height':'570px'});
             $('#tousseItemTable').css({'width':'1130px'});
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r27769 -r27782
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 27769)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 27782)
@@ -467,116 +467,168 @@
 <![endif]-->
 </body>
 <script>
-    var screenWidth = window.screen.width;
-    var screenHeight = window.screen.height;
-
     function isIE() {
 		if(!!window.ActiveXObject || "ActiveXObject" in window){
 		return true;
 		}else{
 		return false;
 	　　 }
     }
+
+    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);
+    }
     
-    $('.mbody').css('width','100%')
+    var screenWidth = ChangeRatio('width');
+	var screenHeight = ChangeRatio('height');
     
-	if(screenWidth == 1024){
+    $('.mbody').css('width','100%');
+    
+	if(screenWidth < 1030){
+        $('.mbody').css({'width':'1920px'});
         $('.add-form .name,.add-form .operator,.add-form .recyclingTime').css({'top':'10px'});
         $('.add-form .depart,.add-form .appType,.add-form .applyTime').css({'top':'90px'});
         $('.add-form .remark,.add-form .communicationUserName').css({'top':'170px'});
         $('.add-form .add,.add-form .add2,.add-form .addQM').css({'margin-top':'240px'});
 
-        $('.data-table').css({'left':'16px','bottom':'270px'});
-        $('#tousseItemBox').css({'height':'590px'});
+        $('.data-table').css({'left':'40px','bottom':'70px','height':'700px'});
+        $('#tousseItemBox').css({'height':'620px'});
         $('.zhuangzai-table').css({'height':'990px','bottom':'80px','right':'55px','width':'610px'});
-        
         if(isIE()){
-			$('.mbody').css('width','188%')
+			$('.mbody').css({'height':'1350px'});
+            $('.data-table').css({'left':'40px','height':'720px'});
+            $('#tousseItemBox').css({'height':'640px'});
+            $('.zhuangzai-table').css({'height':'1030px','bottom':'70px','right':'60px','width':'610px'});
 		}
-	}else if(screenWidth == 1280 && screenHeight == 720){
-		$('.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'});
+    }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'});
 
-        $('.data-table').css({'left':'70px','bottom':'110px','height':'520px'});
-        $('#tousseItemBox').css({'height':'440px'});
-        $('.zhuangzai-table').css({'height':'760px','bottom':'110px'});
-        
-        if(isIE()){
-			$('.mbody').css('width','159%')
-		}
-	}else if(screenWidth == 1280 && screenHeight == 800){
-		$('.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'});
+            $('.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()){
+                $('.data-table').css({'left':'40px','bottom':'50px','height':'580px','width':'1230px'});
+                $('#tousseItemBox').css({'height':'500px'});
+            }
+        }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'});
 
-        $('.data-table').css({'left':'20px','bottom':'55px','height':'580px'});
-        $('#tousseItemBox').css({'height':'500px'});
-        $('.zhuangzai-table').css({'height':'820px','bottom':'55px','right': '50px'});
-        
-        if(isIE()){
-			$('.mbody').css('width','150%')
-		}
-	}else if(screenWidth == 1360 || screenWidth == 1366){
+            $('.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'});
+                $('.data-table').css({'left':'40px','height':'600px'});
+                $('#tousseItemBox').css({'height':'520px'});
+                $('.zhuangzai-table').css({'height':'850px','bottom':'60px','right': '50px'});
+            }
+        }else {
+            $('.mbody').css({'width':'1920px','height':'1460px'});
+            $('.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':'280px'});
+
+            $('.data-table').css({'left':'30px','bottom':'75px','height':'770px'});
+            $('#tousseItemBox').css({'height':'690px'});
+            $('.zhuangzai-table').css({'height':'1080px','bottom':'85px','right': '50px'});
+        }
+	}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'});
 
-        $('.data-table').css({'left':'65px','bottom':'100px','height':'540px'});
-        $('#tousseItemBox').css({'height':'460px'});
+        $('.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()){
-			$('.mbody').css('width','149%')
+			$('.data-table').css({'left':'40px','bottom':'60px','height':'570px','width':'1230px'});
+            $('#tousseItemBox').css({'height':'490px'});
 		}
-    }else if(screenWidth == 1400 || screenWidth == 1440){
+    }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'});
 
-        $('.data-table').css({'left':'10px','bottom':'80px','height':'540px'});
-        $('#tousseItemBox').css({'height':'460px'});
+        $('.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({'width':'134%','height':'1140px'});
-            $('.data-table').css({'left':'40px'});
+            $('.mbody').css({'height':'1130px'});
+            $('.data-table').css({'left':'40px','height':'600px'});
+            $('#tousseItemBox').css({'height':'520px'});
             $('.zhuangzai-table').css({'height':'850px','bottom':'60px','right': '50px'});
 		}
-    }else if(screenWidth == 1600 && screenHeight == 900){
+    }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'});
 
-        $('.data-table').css({'left':'65px','bottom':'90px','height':'550px'});
-        $('#tousseItemBox').css({'height':'470px'});
+        $('.data-table').css({'left':'30px','bottom':'70px','height':'570px','width':'1220px'});
+        $('#tousseItemBox').css({'height':'490px'});
 		$('.zhuangzai-table').css({'height':'770px','bottom':'100px','right': '75px'});
-        
+    }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'});
         if(isIE()){
-			$('.mbody').css('width','126%')
+			$('.mbody_02').css({'height':'1020px'});
 		}
-    }else if(screenWidth == 1280 && screenHeight == 1024){
-		$('.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':'280px'});
-
-        $('.data-table').css({'left':'30px','bottom':'75px','height':'770px'});
-        $('#tousseItemBox').css({'height':'690px'});
-		$('.zhuangzai-table').css({'height':'1080px','bottom':'85px','right': '50px'});
-        
-        if(isIE()){
-			$('.mbody').css('width','150%')
-		}
-    }else if(screenWidth == 1920 && screenHeight == 1080){
-        if(isIE()){
-			$('.mbody').css('width','104%')
-		}
     }
 </script>
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r27769 -r27782
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 27769)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 27782)
@@ -482,7 +482,7 @@
 			tousseType:tousseType},{barcode:basketBarcode,basketName:basketName})
 	}
 
-	if(screenWidth == 1024){
+	if(screenWidth < 1030){
 		trElement.find('dl').css({'width':'800px'});
 		trElement.find('dl .tousseName').css({'width':'330px'});
 		trElement.find('dl .materialName').css({'width':'250px'});
@@ -492,27 +492,39 @@
 			trElement.find('dl .tousseName').css({'width':'70px'});
 			trElement.find('dl .materialName').css({'width':'30px'});
 		}
-	}else if(screenWidth == 1280 && screenHeight == 720){
-		trElement.find('dl').css({'width':'860px'});
-		trElement.find('dl .tousseName').css({'width':'360px'});
-		trElement.find('dl .materialName').css({'width':'280px'});
+	}else if(screenWidth>1270 && screenWidth<1300){
+		if(screenHeight<730){
+			trElement.find('dl').css({'width':'860px'});
+			trElement.find('dl .tousseName').css({'width':'360px'});
+			trElement.find('dl .materialName').css({'width':'280px'});
 
-		if(isIE()){
-			trElement.find('dl').css({'width':'410px'});
-			trElement.find('dl .tousseName').css({'width':'120px'});
-			trElement.find('dl .materialName').css({'width':'70px'});
-		}
-	}else if(screenWidth == 1280 && screenHeight == 800){	
-		trElement.find('dl').css({'width':'805px'});
-		trElement.find('dl .tousseName').css({'width':'335px'});
-		trElement.find('dl .materialName').css({'width':'250px'});
+			if(isIE()){
+				trElement.find('dl').css({'width':'410px'});
+				trElement.find('dl .tousseName').css({'width':'120px'});
+				trElement.find('dl .materialName').css({'width':'70px'});
+			}
+		}else if(screenHeight>790 && screenHeight<810){
+			trElement.find('dl').css({'width':'805px'});
+			trElement.find('dl .tousseName').css({'width':'335px'});
+			trElement.find('dl .materialName').css({'width':'250px'});
 
-		if(isIE()){
-			trElement.find('dl').css({'width':'410px'});
-			trElement.find('dl .tousseName').css({'width':'120px'});
-			trElement.find('dl .materialName').css({'width':'70px'});
+			if(isIE()){
+				trElement.find('dl').css({'width':'410px'});
+				trElement.find('dl .tousseName').css({'width':'120px'});
+				trElement.find('dl .materialName').css({'width':'70px'});
+			}
+		}else {
+			trElement.find('dl').css({'width':'820px'});
+			trElement.find('dl .tousseName').css({'width':'310px'});
+			trElement.find('dl .materialName').css({'width':'270px'});
+
+			if(isIE()){
+				trElement.find('dl').css({'width':'400px'});
+				trElement.find('dl .tousseName').css({'width':'120px'});
+				trElement.find('dl .materialName').css({'width':'60px'});
+			}
 		}
-	}else if(screenWidth == 1366 || screenWidth == 1360){	
+	}else if(screenWidth>1350 && screenWidth<1370){
 		trElement.find('dl').css({'width':'855px'});
 		trElement.find('dl .tousseName').css({'width':'355px'});
 		trElement.find('dl .materialName').css({'width':'280px'});
@@ -522,7 +534,7 @@
 			trElement.find('dl .tousseName').css({'width':'140px'});
 			trElement.find('dl .materialName').css({'width':'80px'});
 		}
-	}else if(screenWidth == 1400 || screenWidth == 1440){	
+	}else if(screenWidth>1390 && screenWidth<1450){
 		trElement.find('dl').css({'width':'800px'});
 		trElement.find('dl .tousseName').css({'width':'340px'});
 		trElement.find('dl .materialName').css({'width':'250px'});
@@ -532,7 +544,7 @@
 			trElement.find('dl .tousseName').css({'width':'140px'});
 			trElement.find('dl .materialName').css({'width':'80px'});
 		}
-	}else if(screenWidth == 1600 && screenHeight == 900){
+	}else if(screenWidth>1590 && screenWidth<1610){
 		trElement.find('dl').css({'width':'855px'});
 		trElement.find('dl .tousseName').css({'width':'355px'});
 		trElement.find('dl .materialName').css({'width':'280px'});
@@ -542,17 +554,7 @@
 			trElement.find('dl .tousseName').css({'width':'190px'});
 			trElement.find('dl .materialName').css({'width':'100px'});
 		}
-	}else if(screenWidth == 1280 && screenHeight == 1024){
-		trElement.find('dl').css({'width':'820px'});
-		trElement.find('dl .tousseName').css({'width':'310px'});
-		trElement.find('dl .materialName').css({'width':'270px'});
-
-		if(isIE()){
-			trElement.find('dl').css({'width':'400px'});
-			trElement.find('dl .tousseName').css({'width':'120px'});
-			trElement.find('dl .materialName').css({'width':'60px'});
-		}
-	}else if(screenWidth == 1920){
+	}else if(screenWidth>1910 && screenWidth<1930){
 		trElement.find('dl').css({'width':'855px'});
 		trElement.find('dl .tousseName').css({'width':'355px'});
 		trElement.find('dl .materialName').css({'width':'280px'});
@@ -791,70 +793,72 @@
 
 	var td_width_0 = '',td_width_1 = '',td_width_2 = '',td_width_3 = '',td_width_5 = '',td_width_7 = '',td_width_8 = '';
 
-	if(screenWidth == 1024){
+	if(screenWidth < 1030){
 		td_width_0 = '200px';
 		td_width_1 = '260px';
 		td_width_2 = '480px';
 		td_width_3 = '100px';
 		td_width_5 = '100px';
 		td_width_7 = '100px';
 		td_width_8 = '160px';
-	}else if(screenWidth == 1280 && screenHeight == 720){
+	}else if(screenWidth>1270 && screenWidth<1300){
+		if(screenHeight<730){
+			td_width_0 = '200px';
+			td_width_1 = '260px';
+			td_width_2 = '480px';
+			td_width_3 = '100px';
+			td_width_5 = '100px';
+			td_width_7 = '100px';
+			td_width_8 = '160px';
+		}else if(screenHeight>790 && screenHeight<810){
+			td_width_0 = '200px';
+			td_width_1 = '260px';
+			td_width_2 = '480px';
+			td_width_3 = '100px';
+			td_width_5 = '100px';
+			td_width_7 = '100px';
+			td_width_8 = '160px';
+		}else {
+			td_width_0 = '200px';
+			td_width_1 = '260px';
+			td_width_2 = '480px';
+			td_width_3 = '100px';
+			td_width_5 = '100px';
+			td_width_7 = '100px';
+			td_width_8 = '160px';
+		}
+	}else if(screenWidth>1350 && screenWidth<1370){
 		td_width_0 = '200px';
 		td_width_1 = '260px';
 		td_width_2 = '480px';
-		td_width_3 = '100px';
-		td_width_5 = '100px';
-		td_width_7 = '100px';
+		td_width_3 = '130px';
+		td_width_5 = '130px';
+		td_width_7 = '130px';
 		td_width_8 = '160px';
-	}else if(screenWidth == 1280 && screenHeight == 800){
+	}else if(screenWidth>1390 && screenWidth<1450){
 		td_width_0 = '200px';
 		td_width_1 = '260px';
 		td_width_2 = '480px';
 		td_width_3 = '100px';
 		td_width_5 = '100px';
 		td_width_7 = '100px';
 		td_width_8 = '160px';
-	}else if(screenWidth == 1366 || screenWidth == 1360){
+	}else if(screenWidth>1590 && screenWidth<1610){
 		td_width_0 = '200px';
 		td_width_1 = '260px';
 		td_width_2 = '480px';
 		td_width_3 = '100px';
 		td_width_5 = '100px';
 		td_width_7 = '100px';
 		td_width_8 = '160px';
-	}else if(screenWidth == 1400 || screenWidth == 1440){
+	}else if(screenWidth>1910 && screenWidth<1930){
 		td_width_0 = '200px';
 		td_width_1 = '260px';
 		td_width_2 = '480px';
 		td_width_3 = '100px';
 		td_width_5 = '100px';
 		td_width_7 = '100px';
 		td_width_8 = '160px';
-	}else if(screenWidth == 1600 && screenHeight == 900){
-		td_width_0 = '200px';
-		td_width_1 = '260px';
-		td_width_2 = '480px';
-		td_width_3 = '100px';
-		td_width_5 = '100px';
-		td_width_7 = '100px';
-		td_width_8 = '160px';
-	}else if(screenWidth == 1280 && screenHeight == 1024){
-		td_width_0 = '200px';
-		td_width_1 = '260px';
-		td_width_2 = '480px';
-		td_width_3 = '100px';
-		td_width_5 = '100px';
-		td_width_7 = '100px';
-		td_width_8 = '160px';
-	}else if(screenWidth == 1920){
-		td_width_0 = '200px';
-		td_width_1 = '260px';
-		td_width_2 = '480px';
-		td_width_3 = '100px';
-		td_width_5 = '100px';
-		td_width_7 = '100px';
-		td_width_8 = '160px';
     }
      var trElement = $('<tr id="tousseItemsTr'+row+'"><td width="'+td_width_0+'" style="font-size: 25px;">'+
                '<input type="hidden" id="tousseDefinitionID'+row+'" name="tousseDefinitionID'+row+'" value="'+tousseDefinitionID+'"/>'+