From 01655fcc4c89bfcf853b69df5752549864be046f Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Tue, 18 Jun 2019 12:25:24 +0800
Subject: [PATCH] =?UTF-8?q?sublist=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/sitemesh3.xml                  | 1 +
 src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp | 8 ++++----
 src/main/webapp/static/global/scripts/common.js        | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml
index 0066cac72..e25597450 100644
--- a/src/main/webapp/WEB-INF/sitemesh3.xml
+++ b/src/main/webapp/WEB-INF/sitemesh3.xml
@@ -39,6 +39,7 @@
   <mapping path="/nis/app/feature/ajax*" exclue="true"/>
   <mapping path="/nis/proxy/cache/ajax*" exclue="true"/>
   <mapping path="/nis/manipulation/ddos/ajax*" exclue="true"/>
+  <mapping path="/nis/objgroup/ajax*" exclue="true"/>
   <!-- 对同一路径，启用多个装饰器 -->
   <mapping>
     <path>/articles/*</path>
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp
index 80a327e9b..390296910 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/subList.jsp
@@ -11,8 +11,8 @@
 	</style>
 </head>
 <c:if test="${fn:length(tabList)==0 and empty _cfg.schedule}">
-	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
-		 class="col-md-1 tabInfo" name="tabTitle${index }">
+	<div id="scheduleTitle${index}" <%--onclick="switchSubCfgTabInfo('schedule',${index})"--%>
+		 class="col-md-1 tabInfo badge-info" name="tabTitle${index }">
 		<spring:message code='schedule' />
 		<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
@@ -29,8 +29,8 @@
 </c:if>
 <!-- 显示 定时任务信息 -->
 <c:if test="${not empty _cfg.schedule }">
-		<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
-			 class="col-md-1 tabInfo" name="tabTitle${index }">
+		<div id="scheduleTitle${index}" <%--onclick="switchSubCfgTabInfo('schedule',${index})"--%>
+			 class="col-md-1 tabInfo badge-info" name="tabTitle${index }">
 			<spring:message code='schedule' />
 			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
 		</div>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 03ecbd9d4..2e877b542 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -61,7 +61,7 @@ $(function(){
 	$("form  input[class~='domainCheck']").attr("maxlength","1024");
 	$("form  input[class~='domainCheck']").attr("minlength","4");
 	//截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb  
-	$("#contentTable").find("td").not(":has(a)").not(".SysException,.commonGroup").each(function(i,element){
+	$("#contentTable").find("td").not(":has(a)").not(".SysException").each(function(i,element){
 	     //获取td当前对象的文本,如果长度大于25;
 		if(!$(element).find(".tooltips").length>0){
 			var tdclass= $(this).attr("class");//no_substr 不进行截取