Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r18392 -r18571
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 18392)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 18571)
@@ -192,13 +192,12 @@
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
-			logger.info("一级供应室回收外来器械完成");
 			recyle.recyle_Foreign();
 			Utils.waitUntilUrlChange(
 					SERVER_URL
 							+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
 					8);
-			logger.info("recyle_Foreign");
+			logger.info("一级供应室回收外来器械完成");
 			/** 判断自定义器械包申请单是否存在 */
 			Utils.retryingFind(By.tagName("body"));
 			element = Utils.retryingFindForthCellOfTable(By
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
===================================================================
diff -u -r18439 -r18571
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java	(.../Utils.java)	(revision 18439)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java	(.../Utils.java)	(revision 18571)
@@ -59,6 +59,7 @@
 	public static JSONObject settings = null;
 
 	public static WebDriver driver;
+	public static int cleanTime=0;
 
 	/**
 	 * 全局等待的设置 WebDriverWait不能用全局变量，Terry Kwan，2017-5-1
@@ -126,10 +127,10 @@
 	 *            对应的driver
 	 */
 	public static void setWaitSetting(WebDriver driver) {
-		// 最长等待15秒,每1秒轮询一次
-		WebDriverWait waitSetting = new WebDriverWait(driver, 8, 350);
-		// 最长等待2秒,每0.3秒轮询一次
-		WebDriverWait confirmWaitSetting = new WebDriverWait(driver, 2, 300);
+		// 最长等待15秒,每0.5秒轮询一次
+		WebDriverWait waitSetting = new WebDriverWait(driver, 15, 500);
+		// 最长等待5秒,每0.5秒轮询一次
+		WebDriverWait confirmWaitSetting = new WebDriverWait(driver, 5, 500);
 		// waitSetting = new FluentWait<>(driver).withTimeout(5000,
 		// TimeUnit.MILLISECONDS).pollingEvery(250, TimeUnit.MILLISECONDS);
 	}
@@ -179,6 +180,11 @@
 			String cap = ((InternetExplorerDriver) driver).getCapabilities()
 					.toString();
 			System.out.println("my cap = " + cap);
+			if(cleanTime==0){
+			Utils.driver.manage().deleteAllCookies();
+			Utils.waitPageLoaded();
+			cleanTime++;
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -464,7 +470,7 @@
 				element.sendKeys(keys);
 
 				// TODO:下面的sleep代码，要改为判断Ext.store是否加载完成，然后点击下拉框，而不是睡眠方式
-				Thread.sleep(1500);
+				doWait(1500);
 				// 等待页面状态加载完成
 				waitPageLoaded();
 				break;
@@ -506,7 +512,7 @@
 		// element = wait
 		// 暂时改成waitSetting,如果有必要,可以每次new一个新的.
 		waitPageLoaded();
-		WebDriverWait waitSetting = new WebDriverWait(driver, 8, 400);
+		WebDriverWait waitSetting = new WebDriverWait(driver, 10, 500);
 		WebElement element = waitSetting
 				.until(new Function<WebDriver, WebElement>() {
 					public WebElement apply(WebDriver driver) {
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
===================================================================
diff -u -r18439 -r18571
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java	(.../One_use.java)	(revision 18439)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java	(.../One_use.java)	(revision 18571)
@@ -134,7 +134,8 @@
 
 			// 必须加上如下的切换代码，否则获取条码的javascript语句执行会报异常错误
 			Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
-			Utils.doWait(500);
+			Utils.waitPageLoaded();
+			Utils.doWait(1000);
 			//等待表单提交成功
 			wait.until(ExpectedConditions.attributeToBe(Utils.driver.findElement(By
 					.id("formSubmitResult")), "value", "1"));
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
===================================================================
diff -u -r18439 -r18571
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java	(.../WaitFactory.java)	(revision 18439)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java	(.../WaitFactory.java)	(revision 18571)
@@ -23,7 +23,7 @@
 	 * @return {@link Wait}
 	 */
 	public static Wait<WebDriver> createDefaultWait() {
-		return createWait(5000, 400);
+		return createWait(10000, 500);
 	}
 
 	/**
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r18392 -r18571
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 18392)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 18571)
@@ -139,7 +139,7 @@
 					By.cssSelector("input[name='basketBarcodeInput']"),
 					Utils.settings.getJSONObject("一级供应室清洗篮筐4").getString("条码")
 							+ "\n");
-
+			
 			Utils.retryingFindAndClick(By.id("checkAllTaskNode-inputRow"));
 			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
 			WebElement element = Utils.retryingFind(By