Index: ssts-selenium-test/src/test/java/test_4_1/Recyle.java
===================================================================
diff -u -r17716 -r17739
--- ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17716)
+++ ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 17739)
@@ -26,6 +26,7 @@
 import org.openqa.selenium.support.ui.Wait;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import bsh.util.Util;
 import test_4_1.tools.Utils;
 
 /**
@@ -38,8 +39,9 @@
 	public void init() {
 		Utils.init();
 		Login login = new Login();
-		login.login_oneSupplyRoom();
-		Utils.changeWindow();
+		//直接跳到回收界面，不用那么麻烦的点桌面回收清洗图标、然后再切换窗口
+		Utils.driver.get(Utils.settings.get("服务器地址").toString() + "/?logonType=1080p");
+		login.loginAction();
 	}
 
 	@Test
Index: ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
===================================================================
diff -u -r17716 -r17739
--- ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java	(.../Utils.java)	(revision 17716)
+++ ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java	(.../Utils.java)	(revision 17739)
@@ -81,8 +81,8 @@
 				.setCapability(
 						InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS,
 						true);
-
-		ieCapabilities.setCapability("applicationName", "cherry");
+		
+		ieCapabilities.setCapability("applicationName", "wangyi");
 		ieCapabilities.setCapability("version", "11.0");
 //		 driver = new InternetExplorerDriver(ieCapabilities);
 
@@ -446,43 +446,8 @@
 			}
 		}
 	}
-
+	
 	/**
-	 * 回收窗口的切换
-	 */
-	public static void changeWindow() {
-		try {
-			// 主窗口
-			String mainWindow = Utils.driver.getWindowHandle();
-			Utils.retryingFindAndClick(By.id("recyclingRecordTouchScreen"));
-			Utils.waitForWindowToOpen(2, 5000);
-			// 遍历所有窗口，切换至新窗口（回收清点窗口）
-			
-			Set<String> handles = Utils.driver.getWindowHandles();
-			System.out.println("准备进行窗口切换，窗口数量：" + handles.size());
-			for (String windowHandle : handles) {
-				if (!windowHandle.equalsIgnoreCase(mainWindow)) {
-					Utils.driver.switchTo().window(windowHandle);
-					System.out.println("切换到新窗口：" + windowHandle);
-				}
-			}
-			Thread.sleep(2000);
-			// 确认已经切换至回收清点窗口
-			String currentUrl = Utils.driver.getCurrentUrl();
-			System.out.println("currentUrl = " + currentUrl);
-			boolean isLoginOk = currentUrl
-					.indexOf("/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980") > 0;
-			if (!isLoginOk) {
-			}
-			Assert.assertTrue(isLoginOk);
-			Thread.sleep(2000);
-		} catch (Exception e) {
-			e.printStackTrace();
-			Assert.fail(e.getMessage());
-		}
-	}
-
-	/**
 	 * 尝试关闭警告对话框，如果弹出了警告对话框，则关闭该对话框 警告框可能有多个，如：器械包过期告警、满意度调查
 	 */
 	public static void tryToCloseWarningWindow() {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r17018 -r17739
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 17018)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 17739)
@@ -40,7 +40,7 @@
 
 	function closeLayer() {
 		var index = parent.LAYER.getFrameIndex();
-		parent.LAYER.close(index);
+		parent.LAYER.close(index);	
 	}
 	
 	function deleteTR(tdObj){
@@ -101,19 +101,9 @@
 			materials : materials
 		});
 		
-		$.ajax({
-			type : 'post',
-			url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!updateForeignTousseDefiniton.do',
-			data : {id : applicationId,foreignTousseInfo : JSON.stringify(foreignTousseInfo)},
-			dataType : 'json',
-			success : function(msg) {
-				alert(msg.message);
-				closeLayer();
-			},
-			error: function(XMLHttpRequest, textStatus, errorThrown) {
-				 alert(textStatus);
-			}
-		});
+		window.parent.submitForeignTousseDefinition(applicationId,JSON.stringify(foreignTousseInfo));
+		
+		closeLayer();
 	}
 	
 	function appendTR(){
Index: ssts-selenium-test/src/test/java/test_4_1/Login.java
===================================================================
diff -u -r17708 -r17739
--- ssts-selenium-test/src/test/java/test_4_1/Login.java	(.../Login.java)	(revision 17708)
+++ ssts-selenium-test/src/test/java/test_4_1/Login.java	(.../Login.java)	(revision 17739)
@@ -98,23 +98,26 @@
 	@Test
 	public void login_oneSupplyRoom() {
 		try {
-			Utils.retryingFind(By.id("j_username_display")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_username_display"),
-					Utils.settings.getJSONObject("一级供应室用户").get("工号")
-							.toString());
-			Utils.retryingFind(By.id("j_password")).clear();
-			Utils.retryingFindAndSendKeys(By.id("j_password"),
-					Utils.settings.getJSONObject("一级供应室用户").get("密码")
-							.toString());
-			Utils.retryingFindAndClick(By.id("btn1"));
-			
+			loginAction();
 			isLoginSuccess();
 			
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
 		}
 	}
+	
+	public void loginAction(){
+		Utils.retryingFind(By.id("j_username_display")).clear();
+		Utils.retryingFindAndSendKeys(By.id("j_username_display"),
+				Utils.settings.getJSONObject("一级供应室用户").get("工号")
+						.toString());
+		Utils.retryingFind(By.id("j_password")).clear();
+		Utils.retryingFindAndSendKeys(By.id("j_password"),
+				Utils.settings.getJSONObject("一级供应室用户").get("密码")
+						.toString());
+		Utils.retryingFindAndClick(By.id("btn1"));
+	}
 
 	/**
 	 * 判断登录是否成功
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r17588 -r17739
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 17588)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 17739)
@@ -1227,6 +1227,21 @@
     });
 }
 
+function submitForeignTousseDefinition(applicationId,foreignTousseInfo){
+	$.ajax({
+		type : 'post',
+		url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!updateForeignTousseDefiniton.do',
+		data : {id : applicationId,foreignTousseInfo : foreignTousseInfo},
+		dataType : 'json',
+		success : function(msg) {
+			alert(msg.message);
+		},
+		error: function(XMLHttpRequest, textStatus, errorThrown) {
+			 alert(textStatus);
+		}
+	});
+}
+
 function amendDisinfectionTousse(row){
 	var tousseName = $('#tousseName'+row).val();
 	var tousseDefinitionID = $('#tousseDefinitionID'+row).val();