Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27632 -r27635
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27632)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27635)
@@ -27,6 +27,7 @@
var clientHeight = '${param.clientHeight}';
var parentPageName = '${param.parentPageName}';
var parentMaterialId = '${param.materialId}';
+var parentImgName = '${param.imgName}';
//动态加载JS和CSS
document.write('');
@@ -172,8 +173,45 @@
amount = 1;
}
currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
- currentType = imageType;//器械包图片
- document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' + imageType + '&page=' + number +'&time='+new Date().getTime();
+ currentType = imageType;//器械包图片
+ var imgUrl;
+ if(parentImgName == '器械包装配教学图片'){
+ imgUrl = '${ctx}/disinfectSystem/packingAction!getImage.do?id='+objId+'&page='+number+'&imageType='+parentImgName+'&originalImg=true';
+ }else {
+ imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' + imageType + '&page=' + number +'&time='+new Date().getTime();
+ }
+ document.getElementById('tousseOrMaterialImage').src = imgUrl;
+ var img = new Image();
+ img.src = imgUrl;
+ img.onload =function(){
+ var divWidth = $('#tousseOrMaterialImageDiv').width();
+ var divHeight = $('#tousseOrMaterialImageDiv').height();
+ if(img.width > img.height){
+ if(img.width > divWidth){
+ $('#tousseOrMaterialImage').css({
+ width:'100%',
+ height:'auto'
+ });
+ }else {
+ $('#tousseOrMaterialImage').css({
+ width:divWidth,
+ height:img.height*(divWidth/img.width)
+ });
+ }
+ }else {
+ if(img.height > divHeight){
+ $('#tousseOrMaterialImage').css({
+ width:'auto',
+ height:'100%'
+ });
+ }else {
+ $('#tousseOrMaterialImage').css({
+ width:img.width*(divHeight/img.height),
+ height:divHeight
+ });
+ }
+ }
+ }
},
error:function(XMLHttpRequest, textStatus, errorThrown){
}
@@ -198,7 +236,13 @@
}else{
cur.page = parseInt(cur.page) + 1;
}
- document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+ var imgUrl;
+ if(parentImgName == '器械包装配教学图片'){
+ imgUrl = '${ctx}/disinfectSystem/packingAction!getImage.do?id='+cur.objId+'&page='+cur.page+'&imageType='+parentImgName+'&originalImg=true';
+ }else {
+ imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+ }
+ document.getElementById('tousseOrMaterialImage').src = imgUrl;
}
function prevPage(){
if(isUndefinedOrNullOrEmpty(currentType)){
@@ -215,7 +259,13 @@
}else{
cur.page = parseInt(cur.page) - 1;
}
- document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+ var imgUrl;
+ if(parentImgName == '器械包装配教学图片'){
+ imgUrl = '${ctx}/disinfectSystem/packingAction!getImage.do?id='+cur.objId+'&page='+cur.page+'&imageType='+parentImgName+'&originalImg=true';
+ }else {
+ imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + cur.imageType + '&page=' + cur.page +'&time='+new Date().getTime();
+ }
+ document.getElementById('tousseOrMaterialImage').src = imgUrl;
}
/**
* 图片放大
@@ -558,8 +608,8 @@
查看包图片
-
-
![]()
+
+
![]()
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r27630 -r27635
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27630)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27635)
@@ -1183,11 +1183,13 @@
text : '教学图片',
hidden : teachingPicture,
handler : function(){
- var imageName = Ext4.getCmp('imageName').getText();
+ var imageName = Ext4.getCmp('imageName').getText();
+ var imageType = Ext4.getCmp('imageType').getValue();
var materialId = Ext4.getCmp('materialId').getValue();
if(imageName != "" && materialId == ""){
var td_id = Ext4.getCmp('td_id').getValue();
- showToussePackingTeachingImage(imageName,td_id);
+ loadGoodsImage(imageName ,imageType ,'',1 ,'' ,td_id,'器械包装配教学图片');
+ //showToussePackingTeachingImage(imageName,td_id);
}
}
},
@@ -2078,10 +2080,13 @@
var tousseDefinitionID = row.td_id;
var currentPage = row.currentPage;
var materialId = row.materialId;
+ var imgName = row.imgName;
var iframeHeight = $('body').height();
+ var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+imgName+'&number='+currentPage;
+
$.magnificPopup.open({
items: [{
- src:WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&number='+currentPage,
+ src:url,
type :'iframe'
},{
//只是为了让箭头出现,如果可以有其他办法,这里可以去掉。因为在tousseImage.jsp内部,修改了下一页和上一页的处理
@@ -2110,8 +2115,13 @@
$(".mfp-iframe-scaler iframe").css({"top":"10px","height":"100%"});
}
}
-function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id){
- var url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + type +'&materialId='+materialId+'&tousseId='+td_id+'&page='+currentPage + '&name='+encodeURIComponent(tousseName);
+function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id,imgName){
+ var url;
+ if(imgName == '器械包装配教学图片'){
+ url = WWWROOT+'/disinfectSystem/packingAction!getImage.do?id='+td_id+'&page='+currentPage+'&imageType='+imgName+'&originalImg=true';
+ }else {
+ url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + type +'&materialId='+materialId+'&tousseId='+td_id+'&page='+currentPage + '&name='+encodeURIComponent(tousseName);
+ }
Ext4.getCmp('imageName').setText(tousseName);
Ext4.getCmp('imageType').setValue(type);
Ext4.getCmp('currentPage').setValue(currentPage);
@@ -2137,7 +2147,8 @@
td_id:td_id,
type:type,
materialId:materialId,
- currentPage:currentPage
+ currentPage:currentPage,
+ imgName:imgName || ''
}
amendDisinfectionTousse(row);
//showImage(this.el.dom.src,tousseName);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r27624 -r27635
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27624)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27635)
@@ -130,6 +130,12 @@
top: 0 !important;
line-height: 44px;
}
+
+#imageContentPanel-innerCt {
+ display: flex !important;
+ align-items: center;
+ justify-content: center;
+}