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 | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
index 4eb9ca7..ed505a2 100644
--- a/gx_tieta/WebRoot/sys-set-test.jsp
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>绯荤粺璁剧疆娴嬭瘯</title>
+ <title>鎵归噺绯荤粺鍙傛暟璁剧疆</title>
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -59,7 +59,7 @@
<div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
<!-- 鏉′欢绛涢�� -->
<div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight">绯荤粺璁剧疆娴嬭瘯</div>
+ <div class="page-filter-header layui-page-filter-fweight">鎵归噺绯荤粺鍙傛暟璁剧疆</div>
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
@@ -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