Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r33170 -r33179 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33170) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33179) @@ -1482,7 +1482,16 @@ if(imageName != "" && materialId == ""){ var td_id = Ext4.getCmp('td_id').getValue(); loadGoodsImage(imageName ,'器械包说明书' ,'',1 ,'' ,td_id); - //showTousseSpecificationImage(imageName,td_id); + setTimeout(function(){ + var row = { + tousseName:imageName, + td_id:td_id, + type:'器械包说明书', + materialId:'', + currentPage:1 + } + amendDisinfectionTousse(row); + }, 500); } } }, @@ -1498,7 +1507,16 @@ if(imageName != "" && materialId == ""){ var td_id = Ext4.getCmp('td_id').getValue(); loadGoodsImage(imageName ,'器械包装配教学图片' ,'',1 ,'' ,td_id); - //showToussePackingTeachingImage(imageName,td_id); + setTimeout(function(){ + var row = { + tousseName:imageName, + td_id:td_id, + type:'器械包装配教学图片', + materialId:'', + currentPage:1 + } + amendDisinfectionTousse(row); + }, 500); } } }, @@ -1562,7 +1580,17 @@ text : '查看包图片', handler : function(){ if(lastSelectTousseName && lastSelectTdId){ - loadGoodsImage(lastSelectTousseName ,lastSelectimageTypeTousse ,'',1 ,lastSelectVedioName ,lastSelectTdId); + loadGoodsImage(lastSelectTousseName ,lastSelectimageTypeTousse ,'',1 ,lastSelectVedioName ,lastSelectTdId); + setTimeout(function(){ + var row = { + tousseName:lastSelectTousseName, + td_id:lastSelectTdId, + type:lastSelectimageTypeTousse, + materialId:'', + currentPage:1 + } + amendDisinfectionTousse(row); + }, 500); } } }, Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r31778 -r33179 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 31778) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 33179) @@ -532,6 +532,18 @@ }) } +//鼠标滚轮事件 +function markBigAndSmall(){ + var box = document.getElementById("tousseOrMaterialImage"); + box.onmousewheel = function(e){ + if(e.wheelDelta > 0){ + markBig(); + }else { + markSmall(); + } + } +} + /** * 全屏 */ @@ -844,6 +856,7 @@ } dragImg(); + markBigAndSmall(); } function checkboxMaterialAll(that){ var trs = $("#materialTable tr");