From 2db47dca3f122307a52e85f990b88d9262e55f76 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Mon, 5 Mar 2018 17:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/systemService/form.jsp      |  6 ++--
 .../WEB-INF/views/systemService/list.jsp      | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp
index 80d767ed2..03ed0d6e5 100644
--- a/src/main/webapp/WEB-INF/views/systemService/form.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp
@@ -212,7 +212,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>系统业务详情</div>
+						<i class="fa fa-gift"></i>详情</div>
 				</div>
 				
 				<div class="portlet-body form">
@@ -317,8 +317,8 @@
 							<div class="form-actions">
 								<div class="row">
 									<div class="col-md-offset-3 col-md-9">
-										<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value="保存"/></shiro:hasPermission>
-										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">取消</button>
+										<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>></shiro:hasPermission>
+										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
 									</div>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp
index 0ea8ce84e..393cf39bd 100644
--- a/src/main/webapp/WEB-INF/views/systemService/list.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp
@@ -28,14 +28,14 @@ function deleteService(id) {
 </script>
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'">刷新</button>
+		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'"><spring:message code="refresh"></spring:message></button>
 		<shiro:hasPermission name="system:service:view">
 			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'">新增</button>
 		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
-		业务管理
+		系统业务管理
 	</h3>
 
 	<div class="row">
@@ -43,11 +43,11 @@ function deleteService(id) {
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i>业务列表
+						<i class="fa fa-cogs"></i>列表
 					</div>
 				</div>
 				
-				<div class="portlet-body"">
+				<div class="portlet-body">
 					<sys:message content="${message}"/>
 					<form:form id="searchForm" modelAttribute="systemServiceInfo" method="post">
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo }"/>
@@ -90,13 +90,13 @@ function deleteService(id) {
 								
 								<span class="search-item">
 									<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
-										<i class="fa fa-edit"></i> 搜索
+										<i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
 									</button>
 								</span>
 							</div>
-						</form:form>
-					</div>
-
+						</div>
+					</form:form>
+					
 					<div class="table-responsive">
 						<table class="table table-bordered">
 							<thead>
@@ -105,9 +105,9 @@ function deleteService(id) {
 									<th style="width:8%">业务ID</th>
 									<th>动作</th>
 									<th>类型</th>
-									<th>创建人</th>
-									<th style="width:15%">创建时间</th>
-									<th>描述</th>
+									<th><spring:message code="creator_id"></spring:message></th>
+									<th style="width:15%"><spring:message code="create_time"></spring:message></th>
+									<th><spring:message code="desc"></spring:message></th>
 									<th>操作</th>
 								</tr>
 							</thead>
@@ -115,7 +115,7 @@ function deleteService(id) {
 								<c:forEach items="${page.list }" var="ssi">
 								<tr>
 									<td>${ssi.serviceName }</td>
-									<td>${ssi.serviceId }</d>
+									<td>${ssi.serviceId }</td>
 									<td>
 										<c:if test="${1 eq ssi.action }">阻断</c:if>
 										<c:if test="${2 eq ssi.action }">监测</c:if>
@@ -134,8 +134,8 @@ function deleteService(id) {
 									<td>${ssi.serviceDesc }</td>
 									<td>
 										<shiro:hasPermission name="system:service:edit">
-											<span><a href="${ctx }/systemService/systemServiceform?id=${ssi.id }">修改</a></span>
-											<span><a href="javascript:void(0)" onclick="deleteService('${ssi.id }')">删除</a></span>
+											<span><a href="${ctx }/systemService/systemServiceform?id=${ssi.id }"><spring:message code="edit"></spring:message></a></span>
+											<span><a href="javascript:void(0)" onclick="deleteService('${ssi.id }')"><spring:message code="delete"></spring:message></a></span>
 										</shiro:hasPermission>
 									</td>
 								</tr>