1.用户多角色菜单重复bug修改 2.配置界面日志总量链接查询

src/main/webapp/static/global/scripts/common.js

@@ -1222,7 +1222,8 @@ var GetLogTotal=function(_data){
 				totalTrs.each(function(){
 					for(var i=0;i<data.length;i++){
 						if($(this).attr("compileId")==data[i].compileId){
-							$(this).html(data[i].sum);
+							$(this).attr("id",i+"logTotal");
+							$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
 						}
 					}
 				})
@@ -1242,6 +1243,29 @@ var GetLogTotal=function(_data){
 	});
 }
 
+var toLogSearch = function(index){
+	// 保存配置界面URL
+	$("#searchForm").each(function(){
+		var cfgUrl = $(this).attr("action");
+		sessionStorage.removeItem('cfgUrl');
+		sessionStorage.setItem('cfgUrl',cfgUrl);
+	});
+	
+	var td = document.getElementById(index+"logTotal");
+	$("td[compileId]").each(function(){
+		if($(this).attr("id") == index+"logTotal"){
+			// 获取检索日志参数
+			var action=$(this).attr("action");
+			var compileId=$(this).attr("compileId");
+			var functionId=$(this).attr("functionId");
+			var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
+			
+			window.location.href = pathName+"/toLogSearch?action="+action+"&functionId="+functionId+"&compileId="+compileId;			
+		}
+	});
+	
+}
+
 //删除区域IP
 function delAreaIp(obj){ 
 	var thisObj=$(obj);

src/main/webapp/static/pages/scripts/pageLogs.js

@@ -48,8 +48,13 @@ $(document).ready(function() {
 			this.setAttribute('width',tdPx+'px');
 		}
 	});
-});
 	
+	// 添加由配置界面跳转到日志查询界面后的返回按钮
+	var cfgId = $("#cfgId").val();
+	if(cfgId != undefined && cfgId != ''){
+		$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>cancel</button>");
+	}
+});
 	
 // 获取字符串对等的像素值
 function getPixelsCount(str, strFontSize){
@@ -76,4 +81,9 @@ function getPixelsCount(str, strFontSize){
 	}
 		
 	return stringPixelsCount;
+}
+function back(){
+	// 获取配置界面URl并跳转
+	var url = sessionStorage.getItem('cfgUrl');
+	window.location.href = url;
 }