From b723761f615f7cf53bb1172e78564f7a6a46fad0 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 27 Aug 2018 15:40:54 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E4=BF=AE=E6=94=B9app=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=20(2)app=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=8D=E5=86=8D=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/SearchReport.java        | 8 ++++++++
 src/main/webapp/WEB-INF/tags/sys/treeselect.tag           | 1 -
 .../WEB-INF/views/specific/specificServiceCfgForm.jsp     | 4 ++--
 src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp       | 8 +-------
 4 files changed, 11 insertions(+), 10 deletions(-)

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<SearchReport>{
 	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<SearchReport>{
 	//界面查询的时间
 	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<nodes.length; i++) {
-						console.log(nodes[i]);
 						//<c:if test="${checked && notAllowSelectParent}">
 						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 @@
 														<div class="form-group cfgType specServiceCode">
 															<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_code"/>:</label>
 															<div class="col-md-4">
-																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[300001,310000]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
 															</div>
 															<div for="specServiceCode"></div>
 														</div> 
@@ -294,7 +294,7 @@
 														<div class="form-group cfgType">
 															<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>
 															<div class="col-md-4">
-																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[10001,20000]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
 															</div>
 															<div for="specServiceCode"></div>
 														</div> 
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("<spring:message code='save' />" + treeNode.name + "?")){
-				return true;
-			}else{
-				setTimeout(function(){zTree.editName(treeNode)}, 10);
-				return false;
-			}
-			
+			return true;
 		}
 		function beforeRemove(treeId, treeNode, newName) {
 			return confirm("<spring:message code='remove' /> " + treeNode.name + "?");