Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27643 -r27646
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27643)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27646)
@@ -162,16 +162,17 @@
var currentType = '';
var currentTypeMap = {};
function loadImage(objId,imageType,td,imgName){
+ var type = (imgName == '器械包装配教学图片')?imgName:imageType
$.ajax({
type:'post',
url:'${ctx}/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do',
- data:{id:objId,imageType:imageType,time:new Date().getTime()},
+ data:{id:objId,imageType:type,time:new Date().getTime()},
dataType:'json',
success:function(msg){
var amount = msg.count;
if(amount <=0){
amount = 1;
- }
+ }
currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
currentType = imageType;//器械包图片
var imgUrl;
@@ -236,6 +237,7 @@
jShowResult('请先选择要显示的内容');
return;
}
+ var imgNameValue = $('#imgNameValue').val();
var cur = currentTypeMap[currentType];
if(isUndefinedOrNull(cur)){
jShowResult('要显示的内容不存在');
@@ -247,7 +249,7 @@
cur.page = parseInt(cur.page) + 1;
}
var imgUrl;
- if(parentImgName == '器械包装配教学图片'){
+ if(imgNameValue == '器械包装配教学图片'){
imgUrl = '${ctx}/disinfectSystem/packingAction!getImage.do?id='+cur.objId+'&page='+cur.page+'&imageType='+encodeURIComponent(parentImgName)+'&originalImg=true';
}else {
imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' +encodeURIComponent(cur.imageType) + '&page=' + cur.page;
@@ -295,6 +297,7 @@
jShowResult('请先选择要显示的内容');
return;
}
+ var imgNameValue = $('#imgNameValue').val();
var cur = currentTypeMap[currentType];
if(isUndefinedOrNull(cur)){
jShowResult('要显示的内容不存在');
@@ -306,7 +309,7 @@
cur.page = parseInt(cur.page) - 1;
}
var imgUrl;
- if(parentImgName == '器械包装配教学图片'){
+ if(imgNameValue == '器械包装配教学图片'){
imgUrl = '${ctx}/disinfectSystem/packingAction!getImage.do?id='+cur.objId+'&page='+cur.page+'&imageType='+encodeURIComponent(parentImgName)+'&originalImg=true';
}else {
imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + encodeURIComponent(cur.imageType) + '&page=' + cur.page;
@@ -464,6 +467,7 @@
//加载器械包图片
function loadTousseImage(imgName){
loadTousseBagNotice();
+ $('#imgNameValue').val(imgName);
if(isUndefinedOrNullOrEmpty(tousseDefinitionID)){
return;
}
@@ -713,6 +717,7 @@
+