Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20830 -r20961 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20830) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20961) @@ -157,11 +157,12 @@ // "\n"); element = Utils.retryingFind(By.id("tousseItemTable")); if (Utils.isFind(element)) { + waitUrlChange(); + } else { Utils.retryingFindClickFirstCellOfTable(By .id("awaitForRecycleTable")); waitUrlChange(); } - waitUrlChange(); WebElement recycleForm = this.scanRecycleUserBarcode(); Utils.retryingFindAndSendKeys( By.id("tousseItemTable"), Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r20878 -r20961 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 20878) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 20961) @@ -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 @@ -138,10 +138,11 @@ // 保存按钮点击后,需要等待提交成功 Utils.waitForWindowAmountEquals(1, 2000); JSWaiter.waitUntilJQueryReady(); - wait.until(ExpectedConditions.attributeToBe( - Utils.driver.findElement(By.id("qmSubmitResult")), "value", - "1")); - + if (Utils.isFind(Utils.retryingFind(By.id("qmSubmitResult")))) { + wait.until(ExpectedConditions.attributeToBe( + Utils.driver.findElement(By.id("qmSubmitResult")), + "value", "1")); + } // 继续灭菌 // Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), // Utils.ACTION_SWITCH_TO_FRAME); @@ -287,13 +288,13 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Calendar calendar = Calendar.getInstance(); - //调短时间使发货不提示 + // 调短时间使发货不提示 calendar.add(Calendar.MINUTE, 1); Utils.retryingFindAndSendKeys( By.id("biologicalMonitoringStartDate"), sdf.format(calendar.getTime())); - //调短时间使发货不提示 + // 调短时间使发货不提示 calendar.add(Calendar.MINUTE, 2); Utils.retryingFindAndSendKeys(By.id("biologicalMonitoringEndDate"), sdf.format(calendar.getTime())); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20954 -r20961 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20954) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20961) @@ -349,9 +349,6 @@ Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By .xpath("//span[contains(text(), '个人桌面')]")); - moveover = new Actions(Utils.driver); - moveover.moveToElement(Utils.retryingFind(By.id("reviewPacking"))) - .perform(); Utils.retryingFindAndHover(By.id("reviewPacking")); Utils.retryingFindAndClick(By.linkText(Utils.settings .getJSONObject("一级供应室装配组").getString("名称3"))); @@ -368,9 +365,6 @@ handleReview(element, review, basket); logger.info("一级供应室审核外来器械完成"); Utils.refresh(); - moveover = new Actions(Utils.driver); - moveover.moveToElement(Utils.retryingFind(By.id("packing"))) - .perform(); Utils.retryingFindAndHover(By.id("packing")); Utils.retryingFindAndClick(By.linkText(Utils.settings .getJSONObject("一级供应室装配组").getString("名称2"))); @@ -416,9 +410,7 @@ logger.info("一级供应室代临床申请外部代理灭菌完成"); Utils.refresh(); /*** 一级供应室审核器械包、敷料包 ***/ - moveover = new Actions(Utils.driver); - moveover.moveToElement(Utils.retryingFind(By.id("reviewPacking"))) - .perform(); + Utils.retryingFindAndHover(By.id("reviewPacking")); Utils.retryingFindAndClick(By.linkText(Utils.settings .getJSONObject("一级供应室装配组").getString("名称1"))); Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking")); @@ -427,9 +419,6 @@ handleReview(element, review, basket); /*** 一级供应室审核器械包、敷料包 ***/ Utils.refresh(); - moveover = new Actions(Utils.driver); - moveover.moveToElement(Utils.retryingFind(By.id("reviewPacking"))) - .perform(); Utils.retryingFindAndHover(By.id("reviewPacking")); Utils.retryingFindAndClick(By.linkText(Utils.settings .getJSONObject("一级供应室装配组").getString("名称2")));