diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java index c99242112..de1798739 100644 --- a/src/main/java/com/nis/domain/log/SearchReport.java +++ b/src/main/java/com/nis/domain/log/SearchReport.java @@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity{ private Integer functionId; private String cfgName; private Integer action; + private String services;//service日志总量统计使用 private Integer reportType;//小时报,日报,月报 //标签,性质,来文函号,境内源Ip,各国目的IP,运营商局点 private String reportBusinessType; @@ -50,6 +51,13 @@ public class SearchReport extends BaseEntity{ //界面查询的时间 private String reportTime; + + public String getServices() { + return services; + } + public void setServices(String services) { + this.services = services; + } /** * reportStartTime * @return reportStartTime diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 7d921eca3..672737077 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -58,7 +58,6 @@ } //wx提示,c:if标签前加了//注释,c:if标签的判断条件仍会生效 for(var i=0; i if (nodes[i].isParent && "${checkedPS}"!=''){ continue; // 如果为复选框选择,并且父子节点有关联,则过滤掉父节点 diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index 7472a716c..17d1034c0 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -285,7 +285,7 @@
- +
@@ -294,7 +294,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp index 4b138a307..4ff6d9515 100644 --- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp +++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp @@ -234,13 +234,7 @@ setTimeout(function(){zTree.editName(treeNode)}, 10); return false; } - if(confirm("" + treeNode.name + "?")){ - return true; - }else{ - setTimeout(function(){zTree.editName(treeNode)}, 10); - return false; - } - + return true; } function beforeRemove(treeId, treeNode, newName) { return confirm(" " + treeNode.name + "?");