Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js
===================================================================
diff -u -r14236 -r15249
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js	(.../showTousseIamge.js)	(revision 14236)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js	(.../showTousseIamge.js)	(revision 15249)
@@ -103,7 +103,7 @@
                 }
                 page = page - 1;
                 
-                var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType;
+                var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.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=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;;
+                var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;;
                 var imageBrowse = top.Ext.get('imageBrowse');
                 var image = imageBrowse.dom;
                 image.src = url;// 覆盖原来的图片 
@@ -186,19 +186,20 @@
     totalPage = 0;
     //加载当前包图片总页数
     Ext.Ajax.request({
-        url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!getInsideTousseDefinitionImageByName.do',
+        url : WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do',
         params : {
             name : name,
             imageType:imageType,
             materialId:materialId
         },
         success : function(result){
-            var pageStr = result.responseText;
-            totalPage = parseInt(pageStr);
+            var pageCount = Ext.decode(result.responseText);
+            totalPage = parseInt(pageCount.count);
+            
             var element = Ext.get(toolbarTotalPage.el);
             element.update(' 共 ' + totalPage + ' 页');
             //加载图片
-            var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(name) + '&page=' + page + '&imageType='+imageType +'&time='+new Date();
+            var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.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;// 覆盖原来的图片