From 44a80c5771029f466e92cb7845f9ca58c14cccb3 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 09:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index e993bc3d3..2f81e58be 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -39,7 +39,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
 	</div>
 
 	<h3 class="page-title">
@@ -51,7 +51,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -73,11 +73,11 @@
 									<form:option value="0"><spring:message code="created"></spring:message></form:option>
 									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-									<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
+									<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
 								</form:select>
-								<spring:message code="request_number"/> :
-								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
-									<form:option value=""><spring:message code="select"/></form:option>
+								<spring:message code="函号"/> :
+								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
+									<form:option value=""></form:option>
 									<c:forEach items="${requestInfos}" var="requestInfo" >
 										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 									</c:forEach>
@@ -85,15 +85,15 @@
 								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button>
-								<spring:message code="sort"/> : 
-								<form:select path="page.orderBy" class="selectpicker select2">
-									<form:option value=""><spring:message code="select"/></form:option>
-									<form:option value="createTime asc"><spring:message code="createTime_asc"/></form:option>
-									<form:option value="createTime desc"><spring:message code="createTime_desc"/></form:option>
-									<form:option value="editTime asc"><spring:message code="editTime_asc"/></form:option>
-									<form:option value="editTime desc"><spring:message code="editTime_desc"/></form:option>
-									<form:option value="auditTime asc"><spring:message code="auditTime_asc"/></form:option>
-									<form:option value="auditTime desc"><spring:message code="auditTime_desc"/></form:option>
+								<spring:message code="排序"/> : 
+								<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
+									<form:option value=""></form:option>
+									<form:option value="createTime asc">按创建时间顺序</form:option>
+									<form:option value="createTime desc">按创建时间倒序</form:option>
+									<form:option value="editTime asc">按修改时间顺序</form:option>
+									<form:option value="editTime desc">按修改时间倒序</form:option>
+									<form:option value="auditTime asc">按审核时间顺序</form:option>
+									<form:option value="auditTime desc">按审核时间倒序</form:option>
 								</form:select>
 							</div>
 						</form:form>
@@ -102,26 +102,26 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th><spring:message code="seq"/></th>
-									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="key_word"/></th>
-									<th><spring:message code="block_type"/></th>
+									<th>序列</th>
+									<th>配置描述</th>
+									<th>配置关键词</th>
+									<th>管控类型</th>
 									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
+									<th>来函</th>
 									<!-- <th>编译id</th> -->
-									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
-									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
+									<th>是否区域管控</th>
+									<th>分类</th>
+									<th>性质</th>
+									<th>标签</th>
 									<!-- <th>区域生效id</th> -->
-									<th><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="creator"/></th>
-									<th><spring:message code="config_time"/></th>
-									<th><spring:message code="editor"/></th>
-									<th><spring:message code="edit_time"/></th>
-									<th><spring:message code="auditor"/></th>
-									<th><spring:message code="audit_time"/></th>
+									<th>有效标识</th>
+									<th>是否审核</th>
+									<th>创建人员</th>
+									<th>配置时间</th>
+									<th>修改人员</th>
+									<th>修改时间</th>
+									<th>审核人员</th>
+									<th>审核时间</th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>