Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringHandle.java =================================================================== diff -u -r34438 -r34446 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringHandle.java (.../QualityMonitoringHandle.java) (revision 34438) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringHandle.java (.../QualityMonitoringHandle.java) (revision 34446) @@ -39,7 +39,7 @@ /** - * 点击监测项 + * 输入监测项 */ public void click_monitoring_items(){ QualityMonitoringPage.get_monitoring_items().click(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java =================================================================== diff -u -r34445 -r34446 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java (.../QualityMonitoringProxy.java) (revision 34445) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java (.../QualityMonitoringProxy.java) (revision 34446) @@ -21,14 +21,15 @@ /** * 添加一条 监测范围为:材料 的记录 + * @param monitoringItems * @param failedResult * @param materialAmount * @param materialName * @param remark * @param responsibleperson * @return */ - public String QualityMonitoring_material(String responsibleperson, String remark, String materialName, String materialAmount, String failedResult){ + public String QualityMonitoring_material(String monitoringItems, String responsibleperson, String remark, String materialName, String materialAmount, String failedResult){ try { //添加一条 监测范围为:材料 的记录 @@ -37,7 +38,7 @@ Utils.driver.switchTo().activeElement(); //填入基本信息 QualityMonitoringHandle.click_monitoring_items(); - QualityMonitoringHandle.click_monitoring_items_option("灭菌失败事件-材料"); + QualityMonitoringHandle.click_monitoring_items_option(monitoringItems); QualityMonitoringHandle.scan_responsible_person_barcode(responsibleperson); QualityMonitoringHandle.input_remark(remark); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java =================================================================== diff -u -r34445 -r34446 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java (.../TestQualityMonitoring.java) (revision 34445) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java (.../TestQualityMonitoring.java) (revision 34446) @@ -55,6 +55,7 @@ @Story("添加一条 监测范围为:材料 的记录") public void test_qualityMonitoring_material() { JSONObject operator = qualityMonitoringJsonObj.getJSONObject("operator");//操作人 + String monitoringItems=qualityMonitoringJsonObj.getJSONObject("material").getString("monitoring_items"); //质量监测项 String responsibleperson=qualityMonitoringJsonObj.getJSONObject("material").getString("responsibleperson"); //责任人 String remark=qualityMonitoringJsonObj.getJSONObject("material").getString("remark"); //备注 String materialName=qualityMonitoringJsonObj.getJSONObject("material").getString("material_name");//抽检器械名称 @@ -71,7 +72,7 @@ //添加一条质量监测记录 logger.debug("添加一条质量监测记录"); - String result= qualityMonitoringProxy.QualityMonitoring_material(responsibleperson,remark,materialName,materialAmount,failedResult); + String result= qualityMonitoringProxy.QualityMonitoring_material(monitoringItems,responsibleperson,remark,materialName,materialAmount,failedResult); logger.debug(result); Assert.assertTrue(result.contains(save)); }