Index: ssts-web/src/main/webapp/imageShow/imageShow.js =================================================================== diff -u -r22601 -r27099 --- ssts-web/src/main/webapp/imageShow/imageShow.js (.../imageShow.js) (revision 22601) +++ ssts-web/src/main/webapp/imageShow/imageShow.js (.../imageShow.js) (revision 27099) @@ -1,7 +1,9 @@ var scale = 1.2;//每次缩放比例 var currentScalePercent = 100;//当前缩放百分比 -var winWidth = 700; -var winHeight = 420; +/* var winWidth = 700; +var winHeight = 420; */ +var winWidth = document.body.clientHeight > 768 ? 1024 : 800; // 动态计算窗口大小,支持在1024x768分辨率下的显示 +var winHeight =document.body.clientHeight > 768 ? 768 : 470; var currentImageWidth = 0; var currentImageId;//当前image对象id var ImgView; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js =================================================================== diff -u -r24096 -r27099 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js (.../tousseUploadImageManager.js) (revision 24096) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js (.../tousseUploadImageManager.js) (revision 27099) @@ -105,8 +105,7 @@ }); //定义上传完成回调函数 } - -function uploadToussePackingImageFile(imageType,id){ +function uploadToussePackingImageFile(imageType,id,tousseName){ toussePackingImageStore = new top.Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id , @@ -148,6 +147,17 @@ width:100, renderer: deleteOrDownLoad, dataIndex:'button' + },{ + id:'imageLook', + menuDisabled: true, + header:'图片预览', + width:100, + renderer: function(v, p, record){ + var html = ''; + html += '图片预览'; + return html; + }, + dataIndex:'imageLook' }]); var tbar = [{ Index: ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js =================================================================== diff -u -r24819 -r27099 --- ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js (.../tousesPackingTeachingImage.js) (revision 24819) +++ ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js (.../tousesPackingTeachingImage.js) (revision 27099) @@ -5,18 +5,28 @@ if(lastLoadObj == null){ return; } - loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage); + loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage,""); } -function loadToussePackingTeachingImage(tousseName,td_id,imgType,currentPage){ +function loadToussePackingTeachingImage(tousseName,td_id,imgType,currentPage,imgId){ lastLoadObj = { tousseName: tousseName, td_id: td_id, imgType: imgType, currentPage: currentPage } + var viewOriginalImgPressed = top.Ext4.getCmp('pt_view_originalImg').pressed; - var url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg='+viewOriginalImgPressed ; - var viewOriginalImg_url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg=true' ; + var url = ""; + var viewOriginalImg_url = ""; + var title = ""; + if(imgId){//器械包定义 + url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + imgType +'&id='+td_id+'&page='+currentPage+'&isOriginalPic=true'; + viewOriginalImg_url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + imgType +'&id='+td_id+'&page='+currentPage; + }else{//装配 + url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg='+viewOriginalImgPressed; + viewOriginalImg_url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg=true' ; + title = '双击预览图片'; + } url += '&time='+new Date(); viewOriginalImg_url += '&time='+new Date(); @@ -34,27 +44,30 @@ var newImage = top.Ext4.create('Ext4.Img', { id : 'pt_browseImage', fieldLabel : "预览图片", - title:'双击预览图片', + title:title, // autoScroll: true, listeners: { render: function() { var imgCmp = this; var imgEl = this.getEl(); - imgCmp.getEl().on("dblclick" , function(e){ - if(this.el.dom.src && this.el.dom.src != ''){ -// alert(this.el.dom.src) - showImage(viewOriginalImg_url,tousseName,function(){ - var obj = { - tousseName: tousseName, - td_id: td_id, - imgType: imgType, - currentPage: currentPage - } - showTousseImages_restore(obj); - }); - tousesPackingTeachingImage_window.close(); - } - }); + if(!imgId){//装配模块才要双击预栏 + imgCmp.getEl().on("dblclick" , function(e){ + if(this.el.dom.src && this.el.dom.src != ''){ + // alert(this.el.dom.src) + showImage(viewOriginalImg_url,tousseName,function(){ + var obj = { + tousseName: tousseName, + td_id: td_id, + imgType: imgType, + currentPage: currentPage + } + showTousseImages_restore(obj); + }); + tousesPackingTeachingImage_window.close(); + } + }); + } + imgEl.on('load',function(){ var img = this; var panel = top.Ext4.getCmp('pt_imageContentPanel'); @@ -122,25 +135,62 @@ function showTousseImages(tousseName,td_id,imgType){ - showTousseImages_newWindow(tousseName,td_id,imgType); + showTousseImages_newWindow(tousseName,td_id,imgType,""); - loadToussePackingTeachingImage(tousseName,td_id,imgType,1); + loadToussePackingTeachingImage(tousseName,td_id,imgType,1,""); } -function showTousseImages_newWindow(tousseName,td_id,imgType){ + +//获取器械包定义图片的行号 +function getRowSeque(imageId){ + var seque; + var store = top.Ext.getCmp("tousseImageGrid").getStore(); + if(store.getCount() > 0){ + for (var i = 1; i <= store.data.length; i++) { + if(imageId == store.getAt(i - 1).get('id')){ + seque = i; + } + } + } + return seque; +} + +/* 器械包定义图片信息 */ +function showTousseDefinitionImages(tousseName,td_id,imgType,imgId){ + showTousseImages_newWindow(tousseName,td_id,imgType,imgId); + loadToussePackingTeachingImage(tousseName,td_id,imgType,getRowSeque(imgId),imgId); +} + +function showTousseImages_newWindow(tousseName,td_id,imgType,imgId){ var totalPage = 0; - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/packingAction!getUploadPicTotalPage.do', - params : { - td_id : td_id, - imageType:imgType - }, - success : function(result){ - var pageStr = result.responseText; - totalPage = parseInt(pageStr); - }, - failure : function(){} - }); - + var imgId = imgId; + if(imgId){//器械包定义 + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do', + params : { + id : td_id, + imageType:imgType + }, + success : function(result){ + var pageCount = Ext4.JSON.decode(result.responseText); + totalPage = parseInt(pageCount.count); + }, + failure : function(){} + }); + }else{//装配 + Ext.Ajax.request({ + url :WWWROOT + '/disinfectSystem/packingAction!getUploadPicTotalPage.do', + params : { + td_id : td_id, + imageType:imgType + }, + success : function(result){ + var pageStr = result.responseText; + totalPage = parseInt(pageStr); + }, + failure : function(){} + }); + } + var imagePanel = new top.Ext4.Panel({ id : 'pt_imagePanel', // height:297, @@ -174,7 +224,7 @@ if(currentPage == 1){ showResult("已是第一页!"); }else{ - loadToussePackingTeachingImage(imageName,td_id,imgType,parseInt(currentPage)-1); + loadToussePackingTeachingImage(imageName,td_id,imgType,parseInt(currentPage)-1,imgId); } }}, {xtype:'button',text:'>>', tooltip :"下一页", handler : function(){ @@ -184,7 +234,7 @@ if(currentPage >= totalPage){ showResult("已是最后一页!"); }else{ - loadToussePackingTeachingImage(imageName,td_id,imgType,parseInt(currentPage)+1); + loadToussePackingTeachingImage(imageName,td_id,imgType,parseInt(currentPage)+1,imgId); } }} ] @@ -209,7 +259,7 @@ tousesPackingTeachingImage_window.show(); } function showTousseImages_restore(lastLoadObj){ - showTousseImages_newWindow(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType); + showTousseImages_newWindow(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,""); - loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage); + loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage,""); } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r26841 -r27099 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 26841) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 27099) @@ -2587,28 +2587,32 @@ id : 'uploadFile', hidden:id == 0?true:false, handler : function(){ - uploadToussePackingImageFile(imageTypeTousse,id); + var tousseName = top.Ext.getCmp('name').getValue(); + uploadToussePackingImageFile(imageTypeTousse,id,tousseName); } }, { text : '说明书', id : 'uploadFile', hidden:id == 0?true:false, handler : function(){ - uploadToussePackingImageFile(imageTypeSpecification,id); + var tousseName = top.Ext.getCmp('name').getValue(); + uploadToussePackingImageFile(imageTypeSpecification,id,tousseName); } },{ text : '清洗操作指引图片', id : 'washGuideImageFile', hidden:id == 0?true:false, handler : function(){ - uploadToussePackingImageFile(imageTypeWashGuide,id); + var tousseName = top.Ext.getCmp('name').getValue(); + uploadToussePackingImageFile(imageTypeWashGuide,id,tousseName); } },{ text : '装配教学图片', id : 'uploadToussePackingImageFile', hidden:id == 0?true:false, handler : function(){ - uploadToussePackingImageFile(imageTypeToussePacking,id); + var tousseName = top.Ext.getCmp('name').getValue(); + uploadToussePackingImageFile(imageTypeToussePacking,id,tousseName); } }, { text : '配包教学视频', Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp =================================================================== diff -u -r26142 -r27099 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 26142) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 27099) @@ -147,6 +147,7 @@ +