From 5d2d5f2ba66ed27eb595fe194bd7817eca89837d Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 24 Aug 2018 17:52:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=8A=A0=E5=AF=86=E9=9A=A7?=
 =?UTF-8?q?=E9=81=93=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE2.=E6=9B=BF=E6=8D=A2=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=AD=E6=96=87=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/DictService.java |  2 +-
 .../views/cfg/encryptedtunnelbehav/form.jsp   | 59 ++++++++++---------
 .../webapp/WEB-INF/views/sys/dictList.jsp     |  6 +-
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/nis/web/service/DictService.java b/src/main/java/com/nis/web/service/DictService.java
index d7cec3d74..a7439b6ea 100644
--- a/src/main/java/com/nis/web/service/DictService.java
+++ b/src/main/java/com/nis/web/service/DictService.java
@@ -52,7 +52,7 @@ public class DictService extends BaseService {
 		}else {//修改
 			
 			//累加修改记录
-			String newRevision = "用户"+UserUtils.getUser().getName()+",在"+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"修改！";
+			String newRevision = "user:"+UserUtils.getUser().getName()+","+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"edit";
 			StringBuilder revisionBuilder = new StringBuilder(newRevision);
 			String oldRevision = sysDictName.getRevision();
 			if(!StringUtil.isBlank(oldRevision)){
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index 0a7a2674a..f0c173338 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -202,33 +202,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 									    </div>
                    					</div>
 									 <div class="row">
-		                              		<div class="col-md-6">
-										        <div class="form-group">
-										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
-										            <div class="col-md-6">
-												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-														 labelName="parent.specServiceName" 
-														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
-														notAllowSelectRoot="true" cssClass="form-control required"/>
-										            </div>
-										            <div for="parent.specServiceName"></div>
-										        </div>
-										    </div>
-										    <div class="col-md-6">
-										    	<div class="form-group">
-										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
-										    	 	 <div class="col-md-6" id="behaviour">
-										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
-										    	 	 <option value=""><spring:message code="select"/></option>
-										    	 	 </select>
-										    	 	 </div>
-										    	</div>
-										    </div>
-									</div>
-									<div class="row">
-										    <div class="col-md-6">
+									 <div class="col-md-6">
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
 										            <div class="col-md-6">
@@ -273,8 +247,37 @@ var delContent = function(contentClassName, addBtnClassName) {
 												</c:forEach>
 											</div>
 											</div>
+		                              		
+									</div>
+									<div class="row">
+										    <div class="col-md-6">
+										        <div class="form-group">
+										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
+										            <div class="col-md-6">
+												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
+														 labelName="parent.specServiceName" 
+														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														notAllowSelectRoot="true" cssClass="form-control required"/>
+										            </div>
+										            <div for="parent.specServiceName"></div>
+										        </div>
+										    </div>
+										    <div class="col-md-6">
+										    	<div class="form-group">
+										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
+										    	 	 <div class="col-md-6" id="behaviour">
+										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
+										    	 	 <option value=""><spring:message code="select"/></option>
+										    	 	 </select>
+										    	 	 </div>
+										    	</div>
+										    </div>
 										   
-										   <div class="col-md-6" id="ratelimit">
+									</div>
+									<div class="row">
+										<div class="col-md-6" id="ratelimit">
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
 										            <div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
index 1ee5c7f8a..3e27b8900 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
@@ -109,7 +109,7 @@
 		      			html+="<td colspan='3'>";
 		      			 	html+="<table class='table table-bordered table-condensed'>";
 		      			  	html+="<thead>";
-		      			  		html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="describe"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
+		      			  		html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="desc"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
 		      			   	html+="</thead>";
 		      			   	html+="<tbody>";
 		      			   	for(i=0;i<data.dictItemList.length;i++){
@@ -158,7 +158,7 @@
 						html+="</tr>";
 						
 						html+="<tr>";
-		      			html+="<th><spring:message code="describe"/>：";
+		      			html+="<th><spring:message code="desc"/>：";
 		      			html+="</th>";
 		      			html+="<td colspan='3'>"+data.remark;
 		      			html+="</td>";
@@ -281,7 +281,7 @@
 				<th class="sort-column module_name" width="15%"><spring:message code="module_name"/></th>
 				<th class="sort-column mark"  width="20%"><spring:message code="dict_mark"/></th>
 				<th class="sort-column create_time" width="15%"><spring:message code="create_time"/></th>
-				<th  width="17%"><spring:message code="describe"/></th>
+				<th  width="17%"><spring:message code="desc"/></th>
 				<th  width="18%"><spring:message code="edit_record"/></th>
 				<shiro:hasPermission name="sys:dict:edit">
 				<th width="15%"><spring:message code="operation"/></th>