Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r25775 -r25953
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 25775)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 25953)
@@ -54,24 +54,27 @@
              dataLength = 11;
          }
          var trData = "";
-         for (var i=0; i<json.length; i++) {
+         for (var i = 0; i<json.length; i++) {
              var materialName = json[i].materialName;
              var materialAmount = json[i].amount;
 			 sumTotal+=parseFloat(materialAmount);
 			 $('#SumTotal').text(sumTotal);
-             trData += '<tr onclick ="getMaterialNameWithAmount(\''+materialName+'\',\''+materialAmount+'\');">';
-             trData += '<td onclick="onMaterialItemClick(\''+json[i].materialDefinitionId+'\',this);" class="w7" style="width:22.6%;height:40px;" align="center">'+materialName+'</td>';
+             trData += '<tr onclick ="getMaterialNameWithAmount(this);">';
+			 trData += '<td  style="width:4%;height:40px;" class="w7 checkbox-materialTd" align="center"><input type="checkbox" name="" class="checkbox-material" value="'+materialName+'" amount="'+materialAmount+'" onclick ="getCheckboxMaterialNameWithAmount(this,event);"/></td>';
+             trData += '<td onclick="onMaterialItemClick(\''+json[i].materialDefinitionId+'\',this);" class="w7" style="width:38.6%;height:40px;" align="center">'+materialName+'</td>';
              trData += '<td onclick="onMaterialItemClick(\''+json[i].materialDefinitionId+'\',this);" class="w8" style="width:8.1%;height:40px;" align="center">'+materialAmount+'</td>';
-             trData += '<td onclick="onDetachableClick(\''+json[i].materialDefinitionId+'\',this);"  class="w8" style="width:12.3%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].detachable)+'</td>';
-             trData += '<td class="w8" style="width:12.3%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].washMethod)+'</td>';
-             trData += '<td onclick="onWashQualityCheckPointClick(\''+json[i].materialDefinitionId+'\',this);" class="w9" style="width:29.6%;height:40px;" align="center">'+json[i].washQualityCheckPoint+'</td>';
-             trData += '<td onclick="onFunctionCheckClick(\''+json[i].materialDefinitionId+'\',this);" class="w10" style="width:15.1%;height:40px;" align="center">'+json[i].functionCheck+'</td>';
+             trData += '<td onclick="onDetachableClick(\''+json[i].materialDefinitionId+'\',this);"  class="w8" style="width:8%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].detachable)+'</td>';
+             trData += '<td class="w8" style="width:10%;height:40px;" align="center">'+emptyStringIfUndefinedOrNull(json[i].washMethod)+'</td>';
+             trData += '<td onclick="onWashQualityCheckPointClick(\''+json[i].materialDefinitionId+'\',this);" class="w9" style="width:16.6%;height:40px;" align="center">'+json[i].washQualityCheckPoint+'</td>';
+             trData += '<td onclick="onFunctionCheckClick(\''+json[i].materialDefinitionId+'\',this);" class="w10" style="width:14.1%;height:40px;" align="center">'+json[i].functionCheck+'</td>';
              trData += '</tr>';
          }
-        document.getElementById("myTable").innerHTML = "<table style='table-layout:fixed;' id='materialTable' border='0' cellspacing='0' cellpadding='0'>" + trData + "</table>";
+        document.getElementById("myTable").innerHTML = "<table style='table-layout:fixed;width:100%;' id='materialTable' border='0' cellspacing='0' cellpadding='0'>" + trData + "</table>";
+		if(sstsConfig.toussePicturesShow && showToussePictures){
+			$(".checkbox-materialTd").show();
+		}
 	});
 }
-
 function getMaterial(){
     var BElement = document.createElement('B');
     var insertText = document.createTextNode(materialName);
@@ -217,12 +220,21 @@
 	loadImage(tousseDefinitionID,imageType);
 	jQuery("#materialTable tr").css("background","#FFFFFF");
 }
-function getMaterialNameWithAmount(materialName,amount){
-	$("#materialNameWithAmount",window.parent.document).attr("amount",amount);
-	$("#materialNameWithAmount",window.parent.document).val(materialName);
+function getMaterialNameWithAmount(that){
+	$(that).siblings().find("td").children(".checkbox-material").prop("checked",false);
+	$(that).find("td").eq(0).children(".checkbox-material").prop("checked",true);
 }
+function getCheckboxMaterialNameWithAmount(that,event){
+	if(event.stopPropagation){
+		event.stopPropagation();//ie9+
+	}else{//ie678
+		event.cancelBubble = true;
+	}
+	if(!$(that).prop("checked")){
+		$("#checkboxMaterialAll").prop("checked",false);
+	}
+}
 
-
 function initPic(){
 	if(sstsConfig.toussePicturesShow){
 		showToussePictures = '${param.showToussePictures}';
@@ -236,26 +248,27 @@
 		getMaterial();
 	}
 	
+	$(".toussePage").show();
 	if(sstsConfig.toussePicturesShow && showToussePictures){
-		$(".toussePage,.instruction-book,.packing-teach,.tousse-video").show();
+		$(".instruction-book,.packing-teach,.tousse-video,.checkbox-materialTd").show();
 		
 	}
 	// add this code after popup JS file is included
-	if(window.parent && window.parent.$ && window.parent.$.magnificPopup && window.parent.$.magnificPopup.instance){
+	/* if(window.parent && window.parent.$ && window.parent.$.magnificPopup && window.parent.$.magnificPopup.instance){
 		window.parent.$.magnificPopup.instance.next = function() {
 			nextPage();
 		  // You may call parent ("original") method like so:
-		  //$.magnificPopup.proto.next.call(this /*, optional arguments */);
-		};
+		  //$.magnificPopup.proto.next.call(this /*, optional arguments );*/
+		/* };
 		window.parent.$.magnificPopup.instance.prev = function() {
 
-			prevPage();
+			prevPage(); */
 
 		  // You may call parent ("original") method like so:
 		  //$.magnificPopup.proto.next.call(this /*, optional arguments */);
-		};
+		/* };
 		
-	}
+	} */
 	if (isIE () && isIE () > 8){
 		var start,end;
 		jQuery(document).bind("mousedown", function(e) { 
@@ -288,6 +301,14 @@
 	    });
 	}
 }
+function checkboxMaterialAll(that){
+	var trs = $("#materialTable tr");
+	if($(that).prop("checked")){
+		$(trs).find("input").prop("checked",true);
+	}else{
+		$(trs).find("input").prop("checked",false);
+	}
+}
 </script>
 </head>
 <style type="text/css">
@@ -297,6 +318,14 @@
 a{text-decoration: none;}
 </style>
 <style type="text/css">   
+.image-box .box .w7{font-size:14px;font-weight: bold;}
+.image-box .box .w8,.image-box .box .w9,.image-box .box .w10{font-size:14px;}
+.image-box .table th{font-size:16px;}
+.image-box .box table td{padding:0;}
+.checkbox-material{
+	width: 15px;
+    height: 15px;
+}
 .left {   
     float:left;   
 }   
@@ -322,10 +351,14 @@
     float:right;   
 } 
 .instruction-book,.packing-teach,.tousse-video{display: none;}
+.imageAndMaterialID{height:637px;}
+.ImageID{width: 50%;height:100%;}
+.image-box{width: 50%;height:100%;}
+.checkbox-materialTd{display: none;}
 </style>   
 
 
-<body onload="initPic();">
+<body onload="initPic();" style="width:100%;height:100%;">
 	<div class="toussePage">
 		<a href="javascript:void(0);" onclick="prevPage();"><<</a>
 		<a href="javascript:void(0);" onclick="nextPage();">>></a>
@@ -334,38 +367,39 @@
         <div id="tousseNameID" onclick="loadTousseImage();" align="center" style="background:#f0f0f0;font-size:30px;height:50px;">
 		</div>
 		</div>
-        <div id="imageAndMaterialID" align="center">
-            <div id="ImageID" class="left" >
-                <img id="tousseOrMaterialImage" style="width:500px;height:352px;vertical-align:middle;text-align:center;"/>
+        <div id="imageAndMaterialID" align="center" class="imageAndMaterialID">
+            <div id="ImageID" class="left ImageID">
+				<img id="tousseOrMaterialImage" style="width:100%;height:546px;vertical-align:middle;text-align:center;"/>
                 <div class="remark-box">
-					<div class="box" style="width:500px;height:60px;text-align:left;">
+					<div class="box" style="width:100%;height:60px;text-align:left;">
 						<h4 class="noticetitle">注意事项</h4>
                			<div class="notice" id="materialRemark">
                			</div>
                		</div>
             	</div>
             	
-            	<div class="btn-box" style="width:500px;height:30px;text-align:left;margin-top:5px;">
+            	<div class="btn-box" style="width:100%;height:30px;text-align:center;margin-top:5px;">
 					<a href="javascript:void(0)" onclick='onOperationGuideClick();'>清洗操作指引</a>
 					<a href="javascript:void(0)" onclick='onInstructionBookClick();' class="instruction-book">说明书</a>
 					<a href="javascript:void(0)" onclick='onPackingTeachClick();' class="packing-teach">装配教学</a>
 					<a href="javascript:void(0)" onclick='onTousseVideoClick();' class="tousse-video">教学视频</a>
                	</div>
             </div>
             <div class="image-box" id="MaterialDIV">
-                <div id="MaterialID" class="table">
+                <div id="MaterialID" class="table" style="width:100%;">
                         <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr class="title">
-                                <th width="22%">材料名称</th>
+								<th width="4%" class="checkbox-materialTd"><input type="checkbox" name="" onclick="checkboxMaterialAll(this);" id="checkboxMaterialAll" class="checkbox-material"/></th>
+                                <th width="38%">材料名称</th>
                                 <th width="8%">数量</th>
-                                <th width="12%">是否可拆</th>
-                                <th width="12%">清洗方式</th>
-                                <th width="29%">清洗质量检查关注点</th>
-                                <th width="17%">功能检查</th>
+                                <th width="8%">是否可拆</th>
+                                <th width="10%">清洗方式</th>
+                                <th width="16%">清洗质量检查关注点</th>
+                                <th width="16%">功能检查</th>
                             </tr>
                         </table>
-                        <div class="box" id="materialDIV">
-                        	<div id='myTable'></div>
+                        <div class="box" id="materialDIV" style="width:100%;height:598px;">
+                        	<div id='myTable' style="width:100%;"></div>
                         </div>
                 </div>
             </div>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25934 -r25953
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25934)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25953)
@@ -1801,6 +1801,7 @@
 	        offset : ['100px','']
 	    });
 	}else if(tousseType == '器械包'){
+		
 //		$.ajax({
 //            type:'post',
 //            url:WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePictureAmount.do',
@@ -1835,6 +1836,15 @@
                     },
                     type: 'image' // this is default type
                 });
+				var windowH = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;
+				if(windowH == 613 || windowH == 689){
+					$(".mfp-iframe-scaler iframe").css({"height":"748px"});
+				}else if(windowH == 661 || windowH == 641){
+					$(".mfp-iframe-scaler iframe").css({"height":"740px"});
+				}else if(windowH == 1001){
+					$(".mfp-iframe-scaler iframe").css({"top":"5%","height":"750px"});
+					$(".mfp-iframe-holder .mfp-close").css({"top":"1px"});
+				}
 //            },
 //            error:function(XMLHttpRequest, textStatus, errorThrown){
 //            }