Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.js
===================================================================
diff -u -r27499 -r27600
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.js	(.../washingMachineStoveUseCountView.js)	(revision 27499)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washingMachineStoveUseCountView.js	(.../washingMachineStoveUseCountView.js)	(revision 27600)
@@ -46,42 +46,54 @@
 		removeMask: true
 	});
 	
-	var jasperReportName = "rinserStoveUseCount.jasper";
 	if(queryType == "明细"){
 		myMask.show();
-		jasperReportName = "rinserStoveUseCountDetail.jasper";
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
-				"?jasperreportName=" + jasperReportName +
-				"&reportName=rinserStoveUseCount" +
-				"&startTime=" + startTime +
-				"&endTime=" + endTime +
-				"&querySupplyRoom=" + querySupplyRoom +
-				"&querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
+		var url = WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do";
+		var params = {
+			jasperreportName : 'rinserStoveUseCountDetail.jasper',
+			startTime : startTime,
+			endTime : endTime,
+			querySupplyRoom : querySupplyRoom,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			queryType : queryType,
+			reportName:'rinserStoveUseCount'
+		}
+
+		seachReport(url,params);
 	}else if(queryType == "listChart"){//图形
-		window.open(WWWROOT+"/disinfectsystem/reportforms/washingMachineStoveUseCountViewList.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&monthSearch=" + monthSearch +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
+		var url = WWWROOT+"/disinfectsystem/reportforms/washingMachineStoveUseCountViewList.jsp";
+		var params = {
+			monthSearch : monthSearch,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			queryType : queryType
+		}
+
+		seachReport(url,params);
 	}else if(queryType == "allYearChart"){//图形对比(全年)
-		window.open(WWWROOT+"/disinfectsystem/reportforms/washingMachineStoveUseCountViewYearCompar.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&year=" + year +
-				"&rinserId=" + rinserId +
-				"&rinserName=" + deocdeUrlParam(rinserName) +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
+		var url = WWWROOT+"/disinfectsystem/reportforms/washingMachineStoveUseCountViewYearCompar.jsp";
+		var params = {
+			year : year,
+			rinserId : rinserId,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			rinserName : deocdeUrlParam(rinserName),
+			queryType : queryType
+		}
+
+		seachReport(url,params);
 	}else{
 		myMask.show();
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
-				"?jasperreportName=" + jasperReportName +
-				"&reportName=rinserStoveUseCount" +
-				"&startTime=" + startTime +
-				"&endTime=" + endTime +
-				"&querySupplyRoom=" + querySupplyRoom +
-				"&querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
+		var url = WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do";
+		var params = {
+			jasperreportName : 'rinserStoveUseCount.jasper',
+			startTime : startTime,
+			endTime : endTime,
+			querySupplyRoom : querySupplyRoom,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			queryType : queryType,
+			reportName:'rinserStoveUseCount'
+		}
+
+		seachReport(url,params);
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
===================================================================
diff -u -r26819 -r27600
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js	(.../sterilizingStoveUseCountView.js)	(revision 26819)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js	(.../sterilizingStoveUseCountView.js)	(revision 27600)
@@ -56,48 +56,58 @@
 		removeMask: true
 	});
 	
-	var jasperReportName = "sterilizingStoveUseCount.jasper";
-	if(queryType == "明细"){
+	if(queryType == "明细"){ 
 		myMask.show();
-		jasperReportName = "sterilizingStoveUseCountDetail.jasper";
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
-				"?jasperreportName=" + jasperReportName +
-				"&reportName=sterilizingStoveUseCount" +
-				"&startTime=" + startTime +
-				"&endTime=" + endTime +
-				"&querySupplyRoom=" + querySupplyRoom +
-				"&querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&sterilizationPurpose=" + sterilizationPurpose +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
-		// supplyRoomRemoteStore.load();
+		var url = WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do";
+		var params = {
+			jasperreportName : 'sterilizingStoveUseCountDetail.jasper',
+			startTime : startTime,
+			endTime : endTime,
+			querySupplyRoom : querySupplyRoom,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			sterilizationPurpose : sterilizationPurpose,
+			queryType : queryType,
+			reportName:'sterilizingStoveUseCount'
+		}
+
+		seachReport(url,params);
 	}else if(queryType == "listChart"){//图形
-		window.open(WWWROOT+"/disinfectsystem/reportforms/sterilizingStoveUseCountViewList.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&sterilizationPurpose=" + sterilizationPurpose +
-				"&monthSearch=" + monthSearch +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
+		var url = WWWROOT+"/disinfectsystem/reportforms/sterilizingStoveUseCountViewList.jsp";
+		var params = {
+			monthSearch : monthSearch,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			sterilizationPurpose : sterilizationPurpose,
+			queryType : queryType
+		}
+
+		seachReport(url,params);
 	}else if(queryType == "allYearChart"){//图形对比(全年)
-		window.open(WWWROOT+"/disinfectsystem/reportforms/sterilizingStoveUseCountViewYearCompar.jsp?querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&sterilizationPurpose=" + sterilizationPurpose +
-				"&year=" + year +
-				"&sterilizerId=" + sterilizerId +
-				"&sterilizerName=" + deocdeUrlParam(sterilizerName) +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
+		var url = WWWROOT+"/disinfectsystem/reportforms/sterilizingStoveUseCountViewYearCompar.jsp";
+		var params = {
+			year : year,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			sterilizationPurpose : sterilizationPurpose,
+			sterilizerId : sterilizerId,
+			sterilizerName : deocdeUrlParam(sterilizerName),
+			queryType : queryType
+		}
+
+		seachReport(url,params);
 	}else{
 		myMask.show();
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
-				"?jasperreportName=" + jasperReportName +
-				"&reportName=sterilizingStoveUseCount" +
-				"&startTime=" + startTime +
-				"&endTime=" + endTime +
-				"&querySupplyRoom=" + querySupplyRoom +
-				"&querySupplyRoomCoding=" + querySupplyRoomCoding +
-				"&sterilizationPurpose=" + sterilizationPurpose +
-				"&queryType=" + queryType,
-				'thisIframe','_self');
-		// supplyRoomRemoteStore.load();
+		var url = WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do";
+		var params = {
+			jasperreportName : 'sterilizingStoveUseCount.jasper',
+			startTime : startTime,
+			endTime : endTime,
+			querySupplyRoom : querySupplyRoom,
+			querySupplyRoomCoding : querySupplyRoomCoding,
+			sterilizationPurpose : sterilizationPurpose,
+			queryType : queryType,
+			reportName:'sterilizingStoveUseCount'
+		}
+
+		seachReport(url,params);
 	}
 }