Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js =================================================================== diff -u -r15591 -r15596 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js (.../sterilizationRecordPic.js) (revision 15591) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordPic.js (.../sterilizationRecordPic.js) (revision 15596) @@ -3,6 +3,8 @@ var currentScalePercent = 100;//当前缩放百分比 var winWidth = 700; var winHeight = 420; +var srcWidth; +var srcHeight; var currentImageWidth = 0; var currentImageId;//当前image对象id var ImgView; @@ -50,7 +52,10 @@ /*Ext.get(this.img_view_id).center(); */ new Ext.dd.DD(Ext.get(this.img_view_id), 'pic');//能够图片在容器中拖动 - Ext.get(this.img_view_id).dom.title='双击放大 右击缩小'; + Ext.get(this.img_view_id).dom.title='双击放大 右击缩小'; + srcWidth = Ext.get(this.img_view_id).getWidth(); + srcHeight = Ext.get(this.img_view_id).getHeight(); + Ext.get(this.img_view_id).on({'dblclick': {fn: function(){ Ext.get(this).parent.zoom(Ext.get(this), scale,true); @@ -97,33 +102,55 @@ if(type == true){ // 顺转 curRotateIndex = (curRotateIndex + 1) % 4; - var angle = curRotateIndex * 90; - el.setStyle('-webkit-transform','rotate(' + angle + 'deg)'); - el.setStyle('-moz-transform','rotate(' + angle + 'deg)');  - el.setStyle('-ms-transform','rotate(' + angle + 'deg)');  - el.setStyle('-o-transform','rotate(' + angle + 'deg)');  - el.setStyle('transform','rotate(' + angle + 'deg)');  - el.setStyle('filter','progid:DXImageTransform.Microsoft.BasicImage(rotation=' + curRotateIndex + ')');  + rotateEl(el,curRotateIndex); }else{ // 逆转 if(curRotateIndex == 0){ curRotateIndex = 4; } curRotateIndex = (curRotateIndex - 1) % 4; - var angle = curRotateIndex * 90; - el.setStyle('-webkit-transform','rotate(' + angle + 'deg)'); - el.setStyle('-moz-transform','rotate(' + angle + 'deg)');  - el.setStyle('-ms-transform','rotate(' + angle + 'deg)');  - el.setStyle('-o-transform','rotate(' + angle + 'deg)');  - el.setStyle('transform','rotate(' + angle + 'deg)');  - el.setStyle('filter','progid:DXImageTransform.Microsoft.BasicImage(rotation=' + curRotateIndex + ')');  + rotateEl(el,curRotateIndex); } }catch(e){ alert(e.message); } + }, + restore: function(el){ + var width = el.getWidth(); + var height = el.getHeight(); + var nwidth = srcWidth; + var nheight = srcHeight; + var left = (nwidth > width) ? -((nwidth - width) / 2):((width - nwidth) / 2); + var top = (nheight > height) ? -((nheight - height) / 2):((height - nheight) / 2); + try{ + el.animate( + { + height: {to: nheight, from: height}, + width: {to: nwidth, from: width}, + left: {by:left}, + top: {by:top} + }, + null, + null, + 'backBoth', + 'motion' + ); + }catch(e){ + //alert(e.msg); + } + curRotateIndex = 0; + rotateEl(el,curRotateIndex); } }); - + var rotateEl = function(el,roteteIndex){ + var angle = roteteIndex * 90; + el.setStyle('-webkit-transform','rotate(' + angle + 'deg)'); + el.setStyle('-moz-transform','rotate(' + angle + 'deg)');  + el.setStyle('-ms-transform','rotate(' + angle + 'deg)');  + el.setStyle('-o-transform','rotate(' + angle + 'deg)');  + el.setStyle('transform','rotate(' + angle + 'deg)');  + el.setStyle('filter','progid:DXImageTransform.Microsoft.BasicImage(rotation=' + roteteIndex + ')');  + } var scrollFunc = function (e) { try{ var direct = 0; @@ -257,6 +284,7 @@ image.src = url;// 覆盖原来的图片 var element = top.Ext.get(toolbarPage.el); element.update('第' + page + '页'); + Ext.get(currentImageId).parent.restore(imageBrowse); } }, toolbarPage, @@ -275,6 +303,7 @@ image.src = url;// 覆盖原来的图片 var element = top.Ext.get(toolbarPage.el); element.update('第' + page + '页'); + Ext.get(currentImageId).parent.restore(imageBrowse); } }] }]