Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r27780 -r27788
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27780)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27788)
@@ -169,7 +169,7 @@
 			objectId:td_id
 		});
 	}
-	openModalWindowForExt(WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp?"+url,'', "打包视频", "740", "400");
+	openModalWindowForExt(WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp?"+url,'', "打包视频", "740", "380");
 }
 function onSupplementIDCard(idCardInfo){
 	return;
@@ -4010,7 +4010,7 @@
 	columns:buildColumnTreeColumns('basketTreeGrid'),
 	listeners:{
 		// cellclick事件改为select事件，便于selenium进行测试
-		select : function( thiz, record, index, eOpts ){
+		itemclick : function( thiz, record, index, eOpts ){
        		var tousseName = record.get('tousseName');
        		var sterilingMethod = record.get('sterilingMethod');
        		var packageType = record.get('packageType');
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27668 -r27788
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27668)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27788)
@@ -162,6 +162,7 @@
 }
 var currentType = '';
 var currentTypeMap = {};
+var handleTyoe = '器械包';
 function loadImage(objId,imageType,td){
 	$.ajax({
         type:'post',
@@ -171,8 +172,13 @@
         success:function(msg){
         	var amount = msg.count;
         	if(amount <=0){
-        		amount = 1;
+				amount = 1;
+				$('#displayPage').hide();
+			}else {
+				$('#displayPage').show();
 			}
+			$('#page').text(number);
+			$('#pageCount').text(amount);
         	currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
 			currentType = imageType;//器械包图片
 			var imgUrl;
@@ -293,6 +299,7 @@
 	}else {
 		imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' +encodeURIComponent(cur.imageType) + '&page=' + cur.page;
 	}
+	document.getElementById('page').innerText = cur.page;
 	document.getElementById('tousseOrMaterialImage').src = imgUrl;
 	var img = new Image();
 	img.src = imgUrl;
@@ -392,8 +399,8 @@
 	}else {
 		imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + encodeURIComponent(cur.imageType) + '&page=' + cur.page;
 	}
+	document.getElementById('page').innerText = cur.page;
 	document.getElementById('tousseOrMaterialImage').src = imgUrl;
-	
 	var img = new Image();
 	img.src = imgUrl;
 	var divWidth = $('#tousseOrMaterialImageDiv').width();
@@ -475,23 +482,63 @@
  * 图片放大
 */
 function markBig(){
-	var width = $('#tousseOrMaterialImage').width();
-	var height= $('#tousseOrMaterialImage').height();
-	$('#tousseOrMaterialImage').width((width*1.1)+'px');
-	$('#tousseOrMaterialImage').height((height*1.1)+'px');
+	var box = document.getElementById("tousseOrMaterialImage");
+	var width = parseInt(box.width);
+	var height= parseInt(box.height);
+	var left = parseInt(box.style.left);
+	var top = parseInt(box.style.top);
+
+	var newLeft = left-((width*0.1)/2);
+	var newTop = top-((height*0.1)/2);
+
+	$('#tousseOrMaterialImage').css({
+		width:(width*1.1)+'px',
+		height:(height*1.1)+'px',
+		top:newTop+'px',
+		left:newLeft+'px'
+	})
 }
 /**
  * 图片缩小
 */
 function markSmall(){
-	var width = $('#tousseOrMaterialImage').width();
-	var height= $('#tousseOrMaterialImage').height();
-	var w = Math.max(30,width*0.9);
-    var h = Math.max(30,height*0.9);
-	$('#tousseOrMaterialImage').width(w+'px');
-	$('#tousseOrMaterialImage').height(h+'px');
+	var box = document.getElementById("tousseOrMaterialImage");
+	var width = parseInt(box.width);
+	var height= parseInt(box.height);
+	var left = parseInt(box.style.left);
+	var top = parseInt(box.style.top);
+
+	var newWidth = Math.max(30,width*0.9);
+    var newHeight = Math.max(30,height*0.9);
+	var newLeft = left+((newWidth*0.1)/2);
+	var newTop = top+((newHeight*0.1)/2);
+
+	$('#tousseOrMaterialImage').css({
+		width:newWidth+'px',
+		height:newHeight+'px',
+		top:newTop+'px',
+		left:newLeft+'px'
+	})
 }
+
 /**
+ * 全屏
+*/
+function fullWindow(){
+	if(isUndefinedOrNullOrEmpty(currentType)){
+		jShowResult('请先选择要显示的内容');
+		return;
+	}
+	var cur = currentTypeMap[currentType];
+	if(isUndefinedOrNull(cur)){
+		jShowResult('要显示的内容不存在');
+		return;
+	}
+	
+	openFullSizeWindowWithName('showFullImg.jsp?page='+cur.page+'&count='+cur.count+'&objId='+cur.objId+'&tousseName='+encodeURIComponent(tousseName)+'&imageType='+encodeURIComponent(cur.imageType),true,'全屏显示图片');
+}
+
+/**
  * 拖动图片
 */
 function dragImg(){
@@ -740,9 +787,9 @@
 	$('#materialDIV').height(materialDIV_Height+'px');
 
 	if(parentPageName == 'packingView'){
-		$(".packing-teach").show();
+		$(".packing-teach,.instruction-book").show();
 	}else if(parentPageName == 'toussePictures'){
-		$(".operationGuide-book,.packing-teach,.tousse-video").show();
+		$(".operationGuide-book,.packing-teach,.tousse-video,.instruction-book").show();
 	}else {
 		$(".operationGuide-book").show();
 	}
@@ -866,7 +913,7 @@
 
 
 <body onload="initPic();" style="width:100%;height:100%;">
-    <div id="tousseDIV" align="center">
+	<div id="tousseDIV" align="center">
         <div id="tousseNameID" onclick="loadTousseImage();" align="center" style="background:#f0f0f0;font-size:30px;height:50px;">
 		</div>
 		</div>
@@ -876,13 +923,17 @@
 					<div>
 						<a href="javascript:void(0)" onclick='markBig()'>放大</a>
 						<a href="javascript:void(0)" onclick='markSmall()'>缩小</a>
+						<a href="javascript:void(0)" onclick='fullWindow()'>全屏</a>
 						<a href="javascript:void(0)" onclick='prevPage();'>上一张</a>
 						<a href="javascript:void(0)" onclick='nextPage();'>下一张</a>
 						<a href="javascript:void(0)" onclick='onOperationGuideClick();' class="operationGuide-book">清洗操作指引</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>
 						<a href="javascript:void(0)" onclick='loadTousseImage();'>查看包图片</a>
+						<div style="float: right;padding-right: 10px;display: none;" id="displayPage">
+							<label id="page">1</label>/<label id="pageCount">1</label>
+						</div>
 					</div>
 				   </div>
 				   <div id="tousseOrMaterialImageDiv">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp	(revision 27788)
@@ -0,0 +1,354 @@
+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
+<%
+	response.setHeader("Access-Control-Allow-Origin", "*");
+%>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>图片全屏显示</title>
+<script type="text/javascript" src="${ctx}/js/common.js"></script>
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
+<script>
+var page = '${param.page}';
+var count = '${param.count}';
+var objId = '${param.objId}';
+var imageType = '${param.imageType}';
+var tousseName = '${param.tousseName}';
+</script>
+</head>
+<style type="text/css">
+body ,html{
+    background: #fff;
+	height: 100%;
+	padding: 0;
+	margin: 0;
+}
+</style>
+
+<body id="body" style="width:100%;height:100%;background: #ccc;">
+	
+</body>
+<script>
+	var that;
+	var ImagePreview = {
+		default_params:{},
+		init:function (param) {
+			if (param) {
+				$.extend(this.default_params, param);
+			}
+			ip_global_img = '';
+			objId = this.default_params.objId;
+			page = parseInt(this.default_params.page);
+			count = parseInt(this.default_params.count);
+			imageType = this.default_params.imageType;
+			tousseName = this.default_params.tousseName;
+			if (objId == '') {
+			return;
+			}
+
+			isMove = false;
+			that = this;
+			ip_global_img = this.showImg(objId,page,count,imageType);
+			this.fnGenerateHtml();
+			this.fnBindEvent(ip_global_img);
+		},
+		showImg:function(objId,page,count,imageType){
+			if(page == 0 || page > count){
+				return '';
+			}
+
+			var img;
+
+			if(imageType == '器械包装配教学图片'){
+				img = this.default_params.WWWROOT+'/disinfectSystem/packingAction!getImage.do?id='+objId+'&page='+page+'&imageType='+encodeURIComponent(imageType)+'&originalImg=true';
+			}else {
+				img = this.default_params.WWWROOT+'/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' +encodeURIComponent(imageType) + '&page=' + page;
+			}
+
+			return img;
+		},
+		fnBindEvent:function (ip_global_img) {
+			if (ip_global_img == '') {
+				return;
+			}
+			this.onClickEvent();
+			this.showTool();
+			$("#ip-img-preview").on('mousewheel DOMMouseScroll', this.onMouseScrollEvent);
+
+			$("#ip-left").hover(this.fnMouseOver,this.fnMouseOut).click(this.fnPrev);
+			$("#ip-right").hover(this.fnMouseOver,this.fnMouseOut).click(this.fnNext);
+
+			$('body').on('mousemove',function(){
+				isMove = true;
+				$("#ip-left").fadeIn();
+				$("#ip-right").fadeIn();
+				$('#ip-name').fadeIn();
+				$('#ip-page').fadeIn();
+			});
+
+			$('body').on('click',function(){
+				isMove = true;
+				$("#ip-left").fadeIn();
+				$("#ip-right").fadeIn();
+				$('#ip-name').fadeIn();
+				$('#ip-page').fadeIn();
+			});
+
+			this.onDragEvent();
+		},
+		showTool:function(){
+			if(isMove){
+				isMove = false;
+			}else {
+				$("#ip-left").hide();
+				$("#ip-right").hide();
+				$('#ip-name').hide();
+				$('#ip-page').hide();
+			}
+
+			setTimeout(function() {
+				that.showTool();
+			}, 1500);
+		},
+		fnGenerateHtml:function () {
+			$("body").append('<img id="ip-img-preview" style="position: fixed;left: 50%;top: 50%;z-index: 19941206;cursor: move;" title="鼠标滚动可缩放图片"/><div id="ip-img-floatshadow" style="z-index: 19941205;opacity: .5;top: 0;left: 0;width: 100%;height: 100%;position: fixed;"></div>');
+			$("body").append('<div id="ip-left" style="display: none; width: 100px; height: 100px;left: 5px; top: 50%; position:fixed;z-index:19941207; cursor: pointer;">' +
+				'<div style="left:-30px;border: 50px solid;border-color: transparent #1CB9C4 transparent transparent;position: absolute;"></div></div>');
+			$("body").append('<div id="ip-right" style="display: none; width: 100px; height: 100px; right: 5px; top: 50%; position:fixed; z-index:19941207;cursor: pointer;">' +
+				'<div style="left:30px;border: 50px solid;border-color: transparent transparent transparent #1CB9C4;position: absolute;"></div></div>');
+			$("body").append('<div id="ip-name" style="width:100%;text-align: center;padding-top: 20px;font-size: 20px;color:#000">'+tousseName+'('+imageType+')</div>');  
+			$("body").append('<div id="ip-page" style="position:fixed;font-size: 18px;right:20px;top:20px;color:#000"><span class="page">'+page+'</span>/<span>'+count+'</span></div>');   
+		},
+		fnMouseOver:function () {
+			$(this).css("background", "#ccc");
+			$(this).css("border", "1px solid #ccc");
+		},
+		fnMouseOut:function () {
+			$(this).css("background", "");
+			$(this).css("border", "");
+		},
+		fnPrev:function () {
+			if (page>1) {
+				page--;
+				var imgUrl = that.showImg(objId,page,count,imageType);
+				$("#ip-page .page").text(page);
+				$("#ip-img-preview").attr("src", imgUrl);
+				ImagePreview.fnReset(imgUrl);
+			}
+		},
+		fnNext:function () {
+			if (page<count) {
+				page++;
+				var imgUrl = that.showImg(objId,page,count,imageType);
+				$("#ip-page .page").text(page);
+				$("#ip-img-preview").attr("src", imgUrl);
+				ImagePreview.fnReset(imgUrl);
+			}
+		},
+		onClickEvent:function (e) {
+			var imgUrl = this.showImg(objId,page,count,imageType);
+			$("#ip-img-preview").attr("src", imgUrl);
+			ImagePreview.fnReset(imgUrl);
+
+			$("#ip-img-preview").fadeIn();
+			$("#ip-left").fadeIn();
+			$("#ip-right").fadeIn();
+			$('#ip-name').fadeIn();
+			$('#ip-page').fadeIn();
+		},
+		fnReturnImgObject:function(img,callback){
+			var divWidth = window.screen.width;
+			var divHeight = window.screen.height;
+			var imgObj = {};
+			if((img.width || 0) !== 0){
+				if(img.width > img.height){
+					if(img.width > divWidth){
+						imgObj = {
+							left:0,
+							top:(divHeight > img.height)?((divHeight-img.height)/2):0
+						}
+					}else {
+						imgObj = {
+							left:(divWidth-img.width)/2,
+							top:(divHeight > img.height)?((divHeight-img.height)/2):0
+						}
+					}
+				}else {
+					if(img.height > divHeight){
+						imgObj = {
+							top:0,
+							left:(divWidth > img.width)?((divWidth-img.width)/2):0
+						}
+					}else {
+						imgObj = {
+							top:(divHeight-img.height)/2,
+							left:(divWidth > img.width)?((divWidth-img.width)/2):0
+						}
+					}
+				}
+				return callback(imgObj);
+			}else {
+				img.onload =function(){
+					if(img.width > img.height){
+						if(img.width > divWidth){
+							imgObj = {
+								left:0,
+								top:(divHeight > img.height)?((divHeight-img.height)/2):0
+							}
+						}else {
+							imgObj = {
+								left:(divWidth-img.width)/2,
+								top:(divHeight > img.height)?((divHeight-img.height)/2):0
+							}
+						}
+					}else {
+						if(img.height > divHeight){
+							imgObj = {
+								top:0,
+								left:(divWidth > img.width)?((divWidth-img.width)/2):0
+							}
+						}else {
+							imgObj = {
+								top:(divHeight-img.height)/2,
+								left:(divWidth > img.width)?((divWidth-img.width)/2):0
+							}
+						}
+					}
+
+					return callback(imgObj);
+				}
+			}
+		},
+		fnReset:function (imgUrl) {
+			$("#ip-img-preview").css({
+				left:'50%',
+				top:'50%',
+				width:'auto',
+				height:'auto'
+			});
+
+			var img = new Image();
+			img.src = imgUrl;
+
+			that.fnReturnImgObject(img,function(imgobj){
+				$("#ip-img-preview").css({
+					left:imgobj.left+'px',
+					top:imgobj.top+'px',
+					width:'auto',
+					height:'auto'
+				});
+			})
+		},
+		onMouseScrollEvent:function (e) {
+			e.preventDefault();
+			var wheel = e.originalEvent.wheelDelta || -e.originalEvent.detail;
+			var delta = Math.max(-1, Math.min(1, wheel));
+			if (delta < 0) { //向下滚动缩小
+				var box = document.getElementById("ip-img-preview");
+				var width = parseInt(box.width);
+				var height= parseInt(box.height);
+
+				var newWidth = Math.max(30,width/1.1);
+				var newHeight = Math.max(30,height/1.1);
+
+				var img = {
+					width:newWidth,
+					height:newHeight
+				}
+
+				that.fnReturnImgObject(img,function(imgObj){
+					var newLeft = imgObj.left;
+					var newTop = imgObj.top;
+
+					$('#ip-img-preview').css({
+						width:parseInt(newWidth)+'px',
+						height:parseInt(newHeight)+'px',
+						top:parseInt(newTop)+'px',
+						left:parseInt(newLeft)+'px'
+					})
+				})
+			} else { //向上滚动放大
+				var box = document.getElementById("ip-img-preview");
+				var width = parseInt(box.width);
+				var height= parseInt(box.height);
+				var left = parseInt(box.style.left);
+				var top = parseInt(box.style.top);
+
+				var newWidth = width*1.1;
+				var newHeight = height*1.1;
+
+				var img = {
+					width:newWidth,
+					height:newHeight
+				}
+
+				that.fnReturnImgObject(img,function(imgObj){
+					var newLeft = imgObj.left;
+					var newTop = imgObj.top;
+
+					$('#ip-img-preview').css({
+						width:parseInt(newWidth)+'px',
+						height:parseInt(newHeight)+'px',
+						top:parseInt(newTop)+'px',
+						left:parseInt(newLeft)+'px'
+					})
+				})
+			}
+		},
+		onDragEvent:function () {
+			var box = document.getElementById("ip-img-preview");
+			var fa = document.getElementById('body');
+			// 图片移动效果
+			box.onmousedown=function(ev) {
+				var oEvent = ev || window.event;
+				// 浏览器有一些图片的默认事件,这里要阻止
+				if(oEvent.preventDefault) {
+					oEvent.preventDefault();
+				}else{
+					oEvent.returnValue = false;
+				}
+				var disX = oEvent.clientX - box.offsetLeft;
+				var disY = oEvent.clientY - box.offsetTop;
+				fa.onmousemove=function (ev) {
+					var oEvent = ev || window.event;
+					// 浏览器有一些图片的默认事件,这里要阻止
+					if(oEvent.preventDefault) {
+						oEvent.preventDefault();
+					}else{
+						oEvent.returnValue = false;
+					}
+					var x = oEvent.clientX -disX;
+					var y = oEvent.clientY -disY;
+					box.style.left = x + 'px';
+					box.style.top = y + 'px';
+				}
+				// 图形移出父盒子取消移动事件,防止移动过快触发鼠标移出事件,导致鼠标弹起事件失效
+				fa.onmouseleave = function () {
+					fa.onmousemove=null;
+					fa.onmouseup=null;
+				}
+				// 鼠标弹起后停止移动
+				fa.onmouseup=function() {
+					if(oEvent.clientX -disX+20 < $('#body').width()){
+						fa.onmousemove=null;
+						fa.onmouseup=null;
+					}
+				} 
+			}
+		}
+	};
+
+	var params = {
+		WWWROOT:'${ctx}',
+		objId:objId,
+		page:page,
+		imageType:imageType,
+		count:count,
+		tousseName:tousseName
+	}
+	
+	ImagePreview.init(params);
+</script>
+</html>
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r27343 -r27788
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 27343)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 27788)
@@ -1084,10 +1084,12 @@
 		});
 	}
 //展示器械包图片信息
-function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId) {
+function getAndShowTousseInfoDiv(tousseName,tousseDefinitionID) {
     currentImageType = "器械包图片";
-    var materialId = "";
-    var materialToolbar = [{
+	var materialId = "";
+	var currentPage = 1;
+
+	var materialToolbar = [{
         text : '查看器械包图片',
         handler : function(){
            currentImageType = "器械包图片";
@@ -1100,11 +1102,12 @@
            loadImage('',tousseName,currentImageType,tousseDefinitionId);
         }
     }];
+
     var materialStore = new top.Ext4.data.Store({
         proxy : {
         	type : 'ajax',
             url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
-            extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionId},
+            extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionID},
             reader : {
     			type : 'json'
     		}
@@ -1129,9 +1132,6 @@
              {header : "材料名称",width : 100,flex: 1, menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, 
              {header : "数量",width : 40, menuDisabled: true,dataIndex : 'count',renderer:gridItemRender}
         ],
-//	viewConfig: {
-//            forceFit: true
-//        },
         plugins: [{
             ptype: 'rowexpander',
             rowBodyTpl : new top.Ext4.XTemplate(
@@ -1159,131 +1159,16 @@
                  var materialDefinitionId = record.data['materialDefinitionId'];
                  var materialName = record.data['name'];
                  if (materialDefinitionId != '') {
-                     materialId = materialDefinitionId;
-                     loadImage(materialDefinitionId,materialName,currentImageType);
+					materialId = materialDefinitionId;
+					var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage;
+					openFullSizeWindowWithName(url,false,currentImageType);
                  }
              }
         }
     });
     
-     top.Ext4.QuickTips.init();//别忘记加这句
-//     materialGrid.on('mouseover', function(e) {// 添加mouseover事件
-//        var index = materialGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
-//        if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
-//            var record = this.getStore().getAt(index);
-//            var rowEl = Ext4.fly(e.getTarget());
-//            rowEl.set({'ext:qtip':'<b>'+record.data['name']+'</b>','ext:qwidth':300,'ext:qtitle':'<b><font style="color: green;">材料名称（点击查看图片）:</font><b></br>'},false);
-//        }
-//     }); 
-    
-//    materialGrid.on('rowclick', function(grid, index, e){
-//        currentImageType = "材料图片";
-//        var selectionModel = grid.getSelectionModel().getSelections();
-//        if(selectionModel.length > 0) {
-//            var materialDefinitionId = selectionModel[0].data['materialDefinitionId'];
-//            var materialName = selectionModel[0].data['name'];
-//            if (materialDefinitionId != '') {
-//                materialId = materialDefinitionId;
-//                loadImage(materialDefinitionId,materialName,currentImageType);
-//            }
-//        }
-//    });
-    
-    /////////////////////////////////////////图片预览
-    
-    var imagePanel = new top.Ext4.Panel({
-        id : 'imagePanel',
-        height :500,
-		border : false,
-		autoScroll: true,
-		layout : 'fit',
-        bbar : [{
-        	xtype:'tbtext',
-        	id:'pageName'
-        },'->',{
-            xtype : 'button',
-            text : '<<',
-            tooltip:'上一页',
-            handler : function(){
-                if (page - 1 <= 0) {
-                    showResult('已是第一页' , null , sstsConfig.messagePauseTimeOnReviewPage);
-                    return;
-                }
-                page = page - 1;
-                
-                var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&tousseId='+tousseDefinitionId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType;
-                var image = top.Ext4.getCmp('browseImage');
-                image.setSrc('');
-                image.setSrc(url);// 覆盖原来的图片
-                var element = top.Ext4.getCmp("toolbarPage");
-                element.update('第 ' + page + ' 页');
-            }
-        },{
-        	xtype:'tbtext',
-        	id:'toolbarPage'
-        },{
-        	xtype:'tbtext',
-        	id:'toolbarTotalPage'
-        },{
-            xtype : 'button',
-            text : '>>',
-            tooltip:'下一页',
-            handler : function() {
-                if (page + 1 > totalPage) {
-                    showResult('已是最后一页' , null , sstsConfig.messagePauseTimeOnReviewPage);
-                    return;
-                }
-                page = page + 1;
-                
-                var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&tousseId='+tousseDefinitionId +'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;;
-                var image = top.Ext4.getCmp('browseImage');
-                image.setSrc('');
-                image.setSrc(url);// 覆盖原来的图片
-                var element = top.Ext4.getCmp("toolbarPage");
-                element.update('第 ' + page + ' 页');
-            }
-        }],
-        items : [{
-    	    xtype : 'image',
-    	    id : 'browseImage',
-    	    fieldLabel : "预览图片",
-    	    //title:'双击预览图片',
-    	    src : Ext.BLANK_IMAGE_URL
-    	}]
-    });
-    
-    /////////////////////////////////////////图片预览
-    
-    var window = new top.Ext4.Window({
-        id : 'packageImg',
-        title : tousseName + '信息',
-        width : 800,
-        height :450,
-        border : false,
-        autoScroll: true,
-        layout : 'border',
-        modal : true,
-        items : [{
-            region : 'center',
-            layout : 'fit',
-            width : '30%',
-            items : materialGrid
-        },{
-            region : 'west',
-            layout : 'fit',
-            width : '70%',
-            items : imagePanel
-        }]
-    });
-    //材料
-    //top.Ext.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
-    materialStore.on("beforeload", function(thiz, options) {
-        thiz.proxy.extraParams["tousseInstanceId"] = id;
-    });
-    materialStore.load();
-    window.show();
-    //图片
-    loadImage('',tousseName,currentImageType,tousseDefinitionId);  
+	var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage;
+	openFullSizeWindowWithName(url,false,currentImageType);
 }
 	var columns = [
 	     {header : "器械包名称",width : 120,dataIndex : 'tousseDefinition.name',renderer:showTousseInfoDiv,sortable:false},
Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r27484 -r27788
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 27484)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 27788)
@@ -33,17 +33,7 @@
 	tousseName = "";
 	
 	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoTypePacking+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
-	var winW = 1020;
-	var winH = 600;
-	var tops = (window.screen.availHeight -winH)/2;
-	var lefts = (window.screen.availWidth -winW)/2;
-	if(window.screen.height == 768){
-		lefts = 0;
-		tops = 0;
-	}
-	
-	var style = "resizable=yes,top="+tops+",left="+lefts+",width="+winW+",height="+winH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no";
-	var videoImgWin = window.open(urls,'图片视频拍摄',style);
+    var videoImgWin = openFullSizeWindowWithName(urls,true,'图片视频拍摄');
 	if(videoImgWin != null ){
 	    videoImgWin.focus(); 
 	}