Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20985 -r20987 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20985) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20987) @@ -299,17 +299,23 @@ button.click(); tousseItemTable = Utils.retryingFind(By.id("tousseItemTable")); tousseItemTable.sendKeys(Utils.settings.getJSONObject( - "一级供应室清洗篮筐4").getString("条码") + "一级供应室清洗篮筐2").getString("条码") + "\n"); dialogWindowClose(); - addButtons = tousseItemTable.findElements(By - .cssSelector(".btn-a")); - Utils.retryingFindAndClick(By - .xpath("//tbody/tr/td/a[contains(text(), '+')]")); - for (WebElement addButton : addButtons) { - // click之前等待页面加载完毕 - JSWaiter.waitUntilJQueryReady(); - addButton.click(); + if (Utils.isFind(Utils.retryingFind(By.cssSelector(".btn-h")))) { + Utils.retryingFindAndClick(By.cssSelector(".btn-h")); + dialogClose(); + } else { + addButtons = tousseItemTable.findElements(By + .cssSelector(".btn-a")); + Utils.retryingFindAndClick(By + .xpath("//tbody/tr/td/a[contains(text(), '+')]")); + for (WebElement addButton : addButtons) { + // click之前等待页面加载完毕 + JSWaiter.waitUntilJQueryReady(); + addButton.click(); + dialogClose(); + } } Utils.retryingFindAndClick(By.id("saveBtn")); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20982 -r20987 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20982) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20987) @@ -12,7 +12,6 @@ import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.WebElement; import org.openqa.selenium.ie.InternetExplorerDriver; -import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.os.WindowsUtils; import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.remote.SessionId; @@ -737,6 +736,7 @@ System.out.println(windowID); JSWaiter.waitUntilJQueryReady(); Utils.driver.quit(); + WindowsUtils.killByName("conhost.exe"); WindowsUtils.killByName("IEDriverServer.exe *32"); WindowsUtils.killByName("IEDriverServer.exe"); WindowsUtils.killByName("iexplore.exe");