Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r17997 -r18054
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 17997)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 18054)
@@ -3,6 +3,8 @@
 var packingMenu ;
 var reviewPackingMenu ;
 var sterilizationRecordMenu ;
+//用来判断Ext4.onReady执行完没有
+var windowOnLoaded = false;
 var tabs;     //tabPanel
 //tips提示的元素,在addIconTips()方法中添加
 var tipsEle = [];
@@ -475,6 +477,7 @@
 	    }
 	});
 	store.load();
+    windowOnLoaded = true;
 });
 //window.onload end
 
@@ -1230,6 +1233,7 @@
     var departCode = globalIsSupplyRoomUser == "true" ? '' : currentDepartCode;
     Ext4.Ajax.request({
         dataType : "json",
+        async: false,
 	    params : {'departCode': departCode},
         url: WWWROOT + "/system/systemWarningAction!getUnReturnWarning.do",
         success: function(response) {
Index: ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
===================================================================
diff -u -r18046 -r18054
--- ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java	(.../Utils.java)	(revision 18046)
+++ ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java	(.../Utils.java)	(revision 18054)
@@ -899,28 +899,21 @@
 	 */
 	public static void tryToCloseWarningWindow() {
 		try {
-			/*Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
+			//先等待portalPage.js的Ext4.onReady执行完
+			waitPageLoaded("return windowOnLoaded == false ? true : false;",8000,100);
+			Wait<WebDriver> wait = new FluentWait<WebDriver>(Utils.driver)
 					.withTimeout(5000, TimeUnit.MILLISECONDS)
 					.pollingEvery(250, TimeUnit.MILLISECONDS)
-					.ignoring(NoSuchElementException.class);*/
+					.ignoring(NoSuchElementException.class);
 			// 等待对话框弹出
 			// wait.until(ExpectedConditions
 			// .visibilityOfElementLocated(By
 			// .xpath("//div/span[contains(text(),'满意度调查表')]")));
 			// 获取警告信息对话框的集合
-			/*List<WebElement> closeBtns = wait
-					.until(new Function<WebDriver, List<WebElement>>() {
-						public List<WebElement> apply(WebDriver driver) {
-							waitPageLoaded();
-							return driver.findElements(By
-									.cssSelector("div[class='x-tool x-tool-close']"));
-
-						}
-					});*/
-			WebDriverWait waitSetting = new WebDriverWait(driver, 8, 350);
-			waitPageLoaded();
-			doWait(100);
-			List<WebElement> closeBtns = waitSetting.until(driver -> driver.findElements(By.cssSelector("div[class='x-tool x-tool-close']")));
+			List<WebElement> closeBtns = wait.until(driver -> {
+                        // waitPageLoaded();
+                        return driver.findElements(By.cssSelector("div[class='x-tool x-tool-close']"));
+                    });
 			int size = closeBtns.size();
 			System.out.println("closeBtns.size() = " + size);
 			// 逐个关闭对话框，先关闭最外层的。如果没关闭最外层的，里面的对话框无法关闭