Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java =================================================================== diff -u -r19657 -r19679 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java (.../ApplyHelper.java) (revision 19657) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java (.../ApplyHelper.java) (revision 19679) @@ -86,6 +86,7 @@ applyGood(applyGood.getKey(), applyGood.getValue()); } doSubmitForm(By.cssSelector("a[id='commitBtn']")); + JSWaiter.waitUntilJQueryReady(); } /** @@ -161,7 +162,7 @@ // throw new RuntimeException("提交失败!"); // } //这里等待提交完成暂时改成用until方式,上面的方法好像不太稳定 - WebDriverWait waitSetting = new WebDriverWait(Utils.driver, 15, 200); + WebDriverWait waitSetting = new WebDriverWait(Utils.driver, 15, 150); if (!waitSetting.until(ExpectedConditions.textToBePresentInElementLocated(By.id("extTipMsg"), "成功"))) { throw new RuntimeException("提交失败!"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r19673 -r19679 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 19673) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 19679) @@ -30,9 +30,9 @@ @Test public static void sterilizationSeriesOperationsOfFristSupplyRoom() { try { - // Utils.init(); - // Login login = new Login(); - // login.login_oneSupplyRoom(); +// Utils.init(); +// Login login = new Login(); +// login.login_oneSupplyRoom(); Wait wait = WaitFactory.createDefaultWait(); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By @@ -77,7 +77,6 @@ Keys.DOWN); Utils.retryingFindAndClick(By .xpath("//div[contains(text(), '器械包灭菌')]")); - // 扫描物品或者审核篮筐 String basketBarcode = Utils.settings.getJSONObject("灭菌篮筐01") .getString("条码"); @@ -121,6 +120,7 @@ // Utils.doWait(500); JSWaiter.waitUntilJQueryReady(); if (Utils.isFind(Utils.retryingFind(By.id("formName")))) { + Utils.retryingFindAndClick(By.id("formName")); Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN); // TODO: 下拉框没选择值 JSWaiter.waitUntilJQueryReady(); @@ -172,10 +172,19 @@ Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationRecord")); - - Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN); - Utils.retryingFindAndClick(By - .xpath("//div/div/div[contains(text(), '灭菌失败事件')]")); + // Utils.doWait(500); + JSWaiter.waitUntilJQueryReady(); + if (Utils.isFind(Utils.retryingFind(By.id("formName")))) { + Utils.retryingFindAndClick(By.id("formName")); + Utils.retryingFindAndSendKeys(By.id("formName"), Keys.DOWN); + // TODO: 下拉框没选择值 + JSWaiter.waitUntilJQueryReady(); + if (Utils.isFind(Utils.retryingFind(By + .xpath("//div/div/div[contains(text(), '灭菌失败事件')]")))) { + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '灭菌失败事件')]")); + } + } Utils.retryingFindAndSendKeys(By.id("tempBarcode"), tempBarcode + "\n"); Utils.retryingFindAndClick(By.id("repacking"));