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/bat-set-test.jsp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index 6d414fa..e0c2d12 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-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><s:text name="Batch_batt_param_set"/></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"><s:text name="Batch_batt_param_set"/></div>
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
@@ -913,7 +913,7 @@
data = rs.data;
data = formatSearchData(data);
}else {
- layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+ layer.msg('娌℃湁鍙缃殑鏈烘埧!');
}
// 濡傛灉鏈夋坊鍔犵殑鏁版嵁
if(data.length !=0) {
--
Gitblit v1.9.1