Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js =================================================================== diff -u -r12331 -r14236 --- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js (.../showTousseIamge.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js (.../showTousseIamge.js) (revision 14236) @@ -103,7 +103,7 @@ } page = page - 1; - var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + tousseName + '&page=' + page+'&imageType='+currentImageType; + var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType; var imageBrowse = top.Ext.get('imageBrowse'); var image = imageBrowse.dom; image.src = url;// 覆盖原来的图片 @@ -123,7 +123,7 @@ } page = page + 1; - var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + tousseName + '&page=' + page +'&imageType='+currentImageType;; + var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;; var imageBrowse = top.Ext.get('imageBrowse'); var image = imageBrowse.dom; image.src = url;// 覆盖原来的图片 @@ -198,7 +198,7 @@ var element = Ext.get(toolbarTotalPage.el); element.update(' 共 ' + totalPage + ' 页'); //加载图片 - var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + name + '&page=' + page + '&imageType='+imageType +'&time='+new Date(); + var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(name) + '&page=' + page + '&imageType='+imageType +'&time='+new Date(); var imageBrowse = top.Ext.get('imageBrowse'); var image = imageBrowse.dom; image.src = url;// 覆盖原来的图片 Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r14217 -r14236 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14217) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14236) @@ -666,7 +666,7 @@ var element = Ext.get(toolbarTotalPage.el); element.update(' 共 ' + totalPage + ' 页'); //加载图片 - var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + name + '&page=' + page + '&imageType='+imageType +'&time='+new Date(); + var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(name) + '&page=' + page + '&imageType='+imageType +'&time='+new Date(); var imageBrowse = top.Ext.get('imageBrowse'); var image = imageBrowse.dom; image.src = url;// 覆盖原来的图片 @@ -783,7 +783,7 @@ } page = page - 1; - var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + tousseName + '&page=' + page+'&imageType='+currentImageType; + var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType; var imageBrowse = top.Ext.get('imageBrowse'); var image = imageBrowse.dom; image.src = url;// 覆盖原来的图片 @@ -803,7 +803,7 @@ } page = page + 1; - var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + tousseName + '&page=' + page +'&imageType='+currentImageType;; + var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;; var imageBrowse = top.Ext.get('imageBrowse'); var image = imageBrowse.dom; image.src = url;// 覆盖原来的图片 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14189 -r14236 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14189) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14236) @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; +import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -1426,7 +1427,12 @@ * 加载上传图片 */ public void getImage() { - String name = StrutsParamUtils.getPraramValue("name", ""); + String name = null; + try { + name = URLDecoder.decode(StrutsParamUtils.getPraramValue("name", ""),"utf-8"); + }catch(Exception ex){ + ex.printStackTrace(); + } String page = StrutsParamUtils.getPraramValue("page", "1"); String imageType = StrutsParamUtils.getPraramValue("imageType", ""); String materialId = StrutsParamUtils.getPraramValue("materialId", ""); Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r14231 -r14236 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14231) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14236) @@ -1580,7 +1580,7 @@ }); function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id){ - var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + tousseName+'&imageType='+type+'&materialId='+materialId+'&page='+currentPage; + var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?imageType=" + type +'&materialId='+materialId+'&tousseId='+td_id+'&page='+currentPage + '&name='+encodeURIComponent(tousseName); var image = Ext4.getCmp('browseImage'); image.setSrc(''); image.setSrc(url);// 覆盖原来的图片 Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js =================================================================== diff -u -r14024 -r14236 --- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 14024) +++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 14236) @@ -33,7 +33,7 @@ } function loadTousseInstanceImage(){ - var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + tousseName+'&imageType=器械包图片'; + var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + encodeURIComponent(tousseName)+'&imageType=器械包图片'; var image = top.Ext4.getCmp('browseImage'); image.setSrc(''); image.setSrc(url);// 覆盖原来的图片