From 97f57b2ba6ffc490ccd9552dbfbdbc245973764d Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 10:20:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/sys-set-test.jsp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
index c6e884b..ed505a2 100644
--- a/gx_tieta/WebRoot/sys-set-test.jsp
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -880,7 +880,7 @@
         					if(rs.code == 1) {
         						data = rs.data;
         					}else {
-        						layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+        						layer.msg('娌℃湁鍙缃殑鏈烘埧!');
         					}
         					
         					// 濡傛灉鏈夋坊鍔犵殑鏁版嵁
@@ -1089,6 +1089,8 @@
 					
 					// 寮瑰嚭璇㈤棶寮瑰嚭妗�
 					layer.confirm('鏄惁鎵归噺閲嶅惎璁惧', {icon: 3, title: '鎻愮ず'}, function(index) {
+						// 鍏抽棴寮瑰嚭妗�
+						layer.close(index);
 						// 瀵规暟鎹繘琛屽鐞�
 						var rsData = [];
 						// 閬嶅巻params鐨勫��

--
Gitblit v1.9.1