Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
===================================================================
diff -u -r21098 -r21506
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java	(.../Utils.java)	(revision 21098)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java	(.../Utils.java)	(revision 21506)
@@ -1057,7 +1057,9 @@
 			// kwan，2017-07-16
 			// 先等待portalPage.js的Ext4.onReady执行完
 			// windowOnLoaded是自定义的JS变量
-			waitPageLoaded("return windowOnLoaded == false ? true : false;",
+//			waitPageLoaded("return windowOnLoaded == false ? true : false;",
+//					15000, 350);
+			waitPageLoaded("if(typeof(windowOnLoaded) != 'undefined' && windowOnLoaded == true){return false;} else {return true;}",
 					15000, 350);
 			Wait<WebDriver> wait = WaitFactory.createDefaultWait();
 			// 等待对话框弹出