Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js =================================================================== diff -u -r34013 -r37368 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js (.../recyclingErrors.js) (revision 34013) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js (.../recyclingErrors.js) (revision 37368) @@ -337,7 +337,7 @@ updateAmountIndex = layer.open({ type: 2, title: ['修改数量', true], - content: './updateAmount.jsp?from=errors&resolution=${param.resolution}&row=' + row, + content: './updateAmount.jsp?from=errors&resolution='+resolution+'&row=' + row, area: [width + 'px', height + 'px'], border: [5, 0.3, '#fff', true], closeBtn: [2, true], Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp =================================================================== diff -u -r29513 -r37368 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp (.../setMaterialRecycleAmount.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp (.../setMaterialRecycleAmount.jsp) (revision 37368) @@ -18,6 +18,7 @@ var tousseName = '${param.tousseName}'; var tousseDefinitionID = '${param.tousseDefinitionID}'; var row = '${param.row}'; + var resolution = '${param.resolution}'; var length = 0; //动态加载JS和CSS @@ -103,7 +104,7 @@ $.layer({ type : 2, title : ['修改数量',true], - iframe : {src : 'updateAmount.jsp?from=errors&resolution=${param.resolution}&row='+row}, + iframe : {src : 'updateAmount.jsp?from=errors&resolution='+resolution+'&row='+row}, area : [width + 'px' , height + 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true], Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp =================================================================== diff -u -r35142 -r37368 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 35142) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 37368) @@ -20,6 +20,7 @@ var supplierName = ""; var tousseDefinitionID = '${param.tousseDefinitionID}'; var applicationId = '${param.applicationId}'; + var resolution = '${param.resolution}'; var recyclingrecordId = '${param.recyclingrecordId}'; var row = '${param.row}'; @@ -205,7 +206,7 @@ $.layer({ type : 2, title : ['修改数量',true], - iframe : {src : 'updateAmount.jsp?from=errors&resolution=${param.resolution}&row='+row+'&recyclingTimes='+recyclingTimes}, + iframe : {src : 'updateAmount.jsp?from=errors&resolution='+resolution+'&row='+row+'&recyclingTimes='+recyclingTimes}, area : [width + 'px' , height + 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true], @@ -239,7 +240,7 @@ } function openSearcheMaterialFrom(obj,rowNum){ - window.open ('addMaterials.jsp?from=errors&resolution=${param.resolution}&row=' + rowNum,'newwindow','height=750,width=1000,top=150,left=350,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no') + window.open ('addMaterials.jsp?from=errors&resolution='+resolution+'&row=' + rowNum,'newwindow','height=750,width=1000,top=150,left=350,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no') } function setMaterialName(row,materialName,isImplant){