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) {
-
-
- - -
- -
-
-
-
-
-
- -
- -
-
-
-
-
-
+
@@ -273,8 +247,37 @@ var delContent = function(contentClassName, addBtnClassName) {
+ +
+
+
+
+ + +
+ +
+
+
+
+
+
+ +
+ +
+
+
-
+
+
+
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+=""; html+=""; html+=""; - html+=""; + html+=""; html+=""; html+=""; for(i=0;i:"; + html+=""; html+=""; @@ -281,7 +281,7 @@ - +
:"; html+=""+data.remark; html+="