k18-ntcs-web-ntc/src/main/webapp/WEB-INF/views/home.jsp

<%@ page language="java" contentType="text/html; charset=UTF-8"
	pageEncoding="UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<!DOCTYPE html>
<html>
<head>

<link rel="shortcut icon" href="${pageContext.request.contextPath}/static/pages/img/logo-K.ico" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>${fns:getStringProperty('productName','NIS')}</title>

<script src="${pageContext.request.contextPath}/static/pages/scripts/home.js" type="text/javascript"></script>

<script type="text/javascript">
	$(document).ready(function() {		
		//$(".page-bar").addClass("hidden");
		
		sessionStorage.setItem("log_total","${log_total}");
		sessionStorage.setItem("log_time_start","${log_time_start}");
		sessionStorage.setItem("log_time_range","${log_time_range}");
		//window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex";
		window.frames['mainFrame'].location="${ctx}/dashboard/logChart";
		//国际化切换
		var lang = "${cookie.Language.value }".toLowerCase();
		var $obj;
		if(lang=="" || lang.indexOf("en")!=-1) {
			$obj = $("#en");
		}else if(lang.indexOf("cn")!=-1) {
			$obj = $("#cn");
		}else if(lang.indexOf("ru")!=-1) {
			$obj = $("#ru");
		}
		$("#lang_text").html($obj.html());
		$obj.parent("li").addClass("hide");
		
		// === Search input typeahead === //
		$('#searchText').typeahead({
			source: function(query,process) {
				
				var sourceArray = new Array();
				$(".accordion:visible a[target='mainFrame']").each(function(){
					
					sourceArray.push($(this).parents("li").attr("menu-name")+"_"+$(this).parents("li").attr("menu-id"));
				})

				return process(sourceArray)
			},
			setValue:function(item){
			},
			items: 8,
			matcher:function(term){
				var mod1 = pinyin.getPY_Header(term);
				var mod2 = pinyin.getPY_All(term);
				var mod3 = term;
				var s1 = mod1.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
				var s2 = mod2.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
				var s3 = mod3.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
				
				return (s1||s2||s3);
			}
		});
		
	  //  console(window.frames['mainFrame'].location);
	    // if(window.frames['mainFrame'].location.search("/dynamicIndex/")!=-1){
	    	//关闭菜单 
	     	//$('.page-sidebar .sidebar-toggler').click();
	    	//f11全屏  
	    	//fullScreen();
	 	//}
	     
		$("#searchText").click(function(){
			$(this).val("");
		});

	});

//页面跳转函数 level:级别，1顶级，2有子级。name:菜单名称，有多级#间隔。url：访问路径。object：点击元素对象。
function page_turn(id, functionId,level, name, url,obj){
	//$(".page-bar").removeClass("hidden");
	var $object = $("#menu_"+id);//点击当前级别
	$(".page-sidebar li").filter(".active,.open").removeClass("active open");//删除选中样式
	
	var $header = $(".page-breadcrumb");//添加头部信息
	$(".page-breadcrumb").empty();

	
	var parent_li = $object.parents("li");
	var parent_parent_li = $object.parents("li").parents("li");
						 
	var breadcrumb = $(".accordion:visible").attr("menu-name");
	if(level==1){//一级菜单
		breadcrumb += "#"+$object.attr("menu-name");
	}else if(level==2){//二级菜单
		parent_li.addClass("active open");
		breadcrumb += "#"+parent_li.attr("menu-name")+"#"+$object.attr("menu-name");
	}else if(level==3){//三级
		parent_li.addClass("active open");
		parent_parent_li.addClass("active open");
		breadcrumb += "#"+parent_parent_li.attr("menu-name")+"#"+parent_li.attr("menu-name")+"#"+$object.attr("menu-name");
	}
	$object.addClass("active");	
	
	
	$header.append("<li><a href='index.html'><spring:message code='home'></spring:message></a> <i class='fa fa-circle'></i></li>");
	var breadcrumbs = breadcrumb.split("#");
	for(var i=0;i<breadcrumbs.length;i++) {
		var circle="";
		if(i!=breadcrumbs.length-1) {
			circle = " <i class='fa fa-circle'></i>";
		}
		$header.append("<li><a href='javascript:void(0);'>"+breadcrumbs[i]+"</a>"+circle+"</li>");
	}
	

    App.scrollTo()
    //日志增加遮罩层
// 	if(url.search("/nis/log/")!=-1){
// 		loading();
// 	}else{
	    App.startPageLoading({animate:true});
// 	}
    //if(url.search("/dynamicIndex/")!=-1){
    // 	$('.page-sidebar .sidebar-toggler').click();
 	//}
    
	//调入页面
	if(url.indexOf("?")>0){
		url = url+"&functionId="+functionId;
	}else{
		url = url+"?functionId="+functionId;
	}
	window.frames['mainFrame'].location=url;
     
    $("#mainFrame").load(function(){
    	 App.stopPageLoading();
    });
}


function searchMenu() {
	
	if ($('body').hasClass("page-sidebar-closed")) {
        if ($('.sidebar-search').hasClass('open') === false) {
            if ($('.page-sidebar-fixed').size() === 1) {
                $('.page-sidebar .sidebar-toggler').click(); //trigger sidebar toggle button

            }
            $('.sidebar-search').addClass("open");
        } else {

          searchForm();
        }
    } else {
    	searchForm()
    }

    if ($('.sidebar-search').size() !== 0) {
        $('.sidebar-search .input-group').on('click', function(e){
            e.stopPropagation();
        });

        $('body').on('click', function() {
            if ($('.sidebar-search').hasClass('open')) {
                $('.sidebar-search').removeClass("open");
            }
        });
    }
}

function searchForm() {
	
	 var search_txt = $("#searchText").val();
		if(search_txt.indexOf('_')!=-1){
			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
			$("#menu"+search_txt+" >a").trigger('click');
		}else {
			alert('未找到该菜单！');
		} 
}

function changeFrameHeight() {

	var iframe = $("#mainFrame");
	var clientHeight = $(window).height();

	var headerHeight = $(".page-header").height();
	var barHeight = $(".page-bar").height();
	var footerHeight = $(".page-footer").height();
	//var paddingHeight  =  20;
	//update for dynamicHomePage S
	var paddingHeight = 11;
	//update for dynamicHomePage E

	iframe.contents().find(".page-content").addClass("page-content-body");
	iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight);
	menuHeight();
}
window.onresize=function(){
	changeFrameHeight();
	menuHeight();
}

function  menuHeight(){
	var height=document.documentElement.clientHeight;
	if($('.overhi')){
		$('.overhi').css({'height':height-82+'px'});
		$('.page-content-wrapper').css({'height':height-82+'px'});
	
	}
}
function refreshCache(cacheName){
	$.ajax({
		type:'post',
		url:'${ctx}/sys/dict/refreshCache',
		data:{"cacheName":cacheName},
		dataType:'text',
		async:false,
		success:function(data,textStatus){
			if(data=="success"){
				alert("缓存清理成功");
			}else{
				alert("缓存清理失败");
			}
		}
	})
}
function initSpoofingIp(){
	$.ajax({
		type:'post',
		url:'${ctx}/cfg/dnsIp/initSpoofingIp',
		dataType:'text',
		async:false,
		success:function(data,textStatus){
			if(data=="success"){
				alert("success");
			}else{
				alert(data);
			}
		}
	})
}
</script>
<style type="text/css">
.bodyhi{
  overflow: hidden;
}
.overhi{
    overflow-y: auto;
    overflow-x: hidden;
}
#helpHref{
padding:16px 6px 13px 8px;
color:#c5c5c5
}
#helpHref:hover{
background:#3d3d3d;
}
</style>
</head>


<body class="page-header-fixed page-sidebar-closed-hide-logo page-content-white bodyhi">
	<!-- BEGIN HEADER -->
	<div class="page-header navbar navbar-fixed-top">

		<!-- BEGIN HEADER INNER -->
		<div class="page-header-inner ">
			<!-- BEGIN LOGO -->
			<div class="page-logo">
				<a href="index.html"> <img
					src="${pageContext.request.contextPath}/static/layouts/layout/img/logo2-K.png"
					alt="logo" class="logo-default" />
				</a>
				<!-- <button type="button"  onclick="javascript:fullScreen();">a</button> -->
				
				<div class="menu-toggler sidebar-toggler">
                     <span></span>
                 </div>
			</div>
			<!-- END LOGO -->


			<!-- BEGIN MEGA MENU -->
			<div class="hor-menu  hidden-sm hidden-xs">
				
				<ul class="nav navbar-nav mega-menu">
		           <c:forEach items="${fns:getMenuTreeList()}" var="menu" varStatus="idxStatus">
		           		
		           		<c:if test="${menu.isTop eq 1 && menu.isShow eq 1}">
	                  
				  			<li> 
					  			<c:choose>
					  				<c:when test="${not empty menu.children and menu.children[0].isTop eq 1 }">
					  				
					  					<a href="javascript:;" id="${menu.id}" data-hover="megamenu-dropdown" data-close-others="true"
					  						data-original-title="<spring:message code="${menu.code}"/>" class="tooltips" data-placement="right">
							  				<%-- ${menu.name } --%><%-- <spring:message code="${menu.code}"></spring:message> --%>
							  				<c:set var="menuName" ><spring:message code='${menu.code}'/></c:set>
							  				${fns:abbr(menuName,50) }
							  				<i class="fa fa-angle-down"></i>
						  				</a>
						  				
						  				<ul class="dropdown-menu pull-left">
				          					<c:forEach  items="${menu.children}" var="secondMenu" varStatus="secondStatus">
				          						<c:if test="${secondMenu.isTop eq 1 && secondMenu.isShow eq 1}">
				          							<%-- <c:if test="${secondStatus.index==2}">
				          								<li class="divider"></li>
				          							</c:if> --%>
				          							<li>
				          								<a href="javascript:;" id="${secondMenu.id}">
				          									<i class="${secondMenu.icon }"></i>&nbsp;
				          									<%-- ${secondMenu.name } --%><spring:message code="${secondMenu.code}"></spring:message>
				          								</a>
				          							</li> 
				          							<li class="divider"></li>
				          						</c:if>
				          						
				          					</c:forEach>
				          					
			          					</ul>
					  				</c:when>
					  				
					  				<c:otherwise>
					  					<a href="javascript:;" id="${menu.id}" data-original-title="<spring:message code="${menu.code}"/>" class="tooltips" data-placement="bottom">
							  				<%-- ${menu.name } --%><%-- <spring:message code="${menu.code}"></spring:message> --%>
							  				<c:set var="menuName" ><spring:message code='${menu.code}'/></c:set>
							  				${fns:abbr(menuName,50) }
						  				</a>
					  				</c:otherwise>
					  			</c:choose>
		          				
				  			</li>
				  		
				  	    </c:if>
          				
          			</c:forEach>
		           
	           </ul>
	           
			</div>
			<!-- END MEGA MENU -->

			<input type="hidden"  id="tb_custom" value="<spring:message code='cfg_custom'/>"/>
			<input type="hidden"  id="jbox_cfg_url" value="${ctx}/toLogSearch/logTrend"/>
			<!-- BEGIN TOP NAVIGATION MENU -->
			<div class="top-menu">
				<ul class="nav navbar-nav pull-right">
					<c:if test="${fns:getUser().isAdmin()}">
						<li  class="dropdown  dropdown-user" id="cache">
							<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" >
	                         	<i class="fa fa-language"></i><span class="username username-hide-on-mobile" id="cache_text"> clear cache  </span>
	                         </a>
							<ul class="dropdown-menu">
								<li>
									<a href="javascript:refreshCache('functionServiceDict')">refresh function service</a>
								</li>
								<li>
									<a href="javascript:refreshCache('functionRegionDict')">refresh function region</a>
								</li>
								<li>
									<a href="javascript:refreshCache('asnNoCache')">refresh ASN no</a>
								</li>
								<li>
									<a href="javascript:initSpoofingIp()">Init Spoofing Ip</a>
								</li>
							</ul>
						</li>
					</c:if>
					<li class="dropdown  dropdown-user nav">
                         <a href="${pageContext.request.contextPath}/static/PotPlayerSetup64.exe" id="helpHref"  target="_self" >
                         	<i class="fa fa-cloud-download"></i>
                         	<span class="username username-hide-on-mobile" id="help">  
                         		<spring:message code="cut_sample_tool" />
                         	</span>
                         </a>
                     </li>
					<!-- 在线帮助 -->
					<li class="dropdown  dropdown-user nav">
                         <a href="${ctx}/sys/help" id="helpHref"  target="mainFrame" >
                         	<i class="icon-question  font-sharp"></i>
                         	<span class="username username-hide-on-mobile" id="help">  
                         		<spring:message code="help" />
                         	</span>
                         </a>
                     </li>
                     <!-- 系统语言 -->
				     <li class="dropdown  dropdown-user" id="language">
				     	
				     	 
                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" >
                         	<i class="fa fa-language"></i><span class="username username-hide-on-mobile" id="lang_text">  </span>
                         </a>
                        
                         <ul class="dropdown-menu">
                    	   <li><a href="${pageContext.request.contextPath}/language?language=zh_CN" id="cn">&nbsp;简体中文&nbsp;</a></li>
                           <li><a href="${pageContext.request.contextPath}/language?language=en" id="en">&nbsp;English&nbsp;</a></li>
						   <li><a href="${pageContext.request.contextPath}/language?language=ru" id="ru">&nbsp;русский язык&nbsp;</a></li>
                         </ul>
                     </li> 

					<!-- BEGIN USER LOGIN DROPDOWN -->
					<li class="dropdown dropdown-user"><a href="javascript:;"
						class="dropdown-toggle" data-toggle="dropdown"
						data-close-others="true"> 
						<img alt="" class="img-circle" src=${fns:getUser().photo }/>
<%-- 							src="${pageContext.request.contextPath}/static/pages/img/avatar.png" /> --%>
							<span class="username username-hide-on-mobile"> 
								${fns:getUser().name}</span> <i class="fa fa-angle-down"></i>
					</a>
						<ul class="dropdown-menu dropdown-menu-default">
							
							<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; <spring:message code="userInfo"></spring:message></a></li>
							<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; <spring:message code="updatePwd"></spring:message></a></li>
							<li><a href="${pageContext.request.contextPath }/logout" >
								<i class="icon-key"></i>&nbsp;  <spring:message code="exit"></spring:message></a></li>
						</ul></li>
					<!-- END USER LOGIN DROPDOWN -->

				</ul>
			</div>
			<!-- END TOP NAVIGATION MENU -->


		</div>
		<!-- END HEADER INNER -->
	</div>
	<!-- END HEADER -->


	<!-- BEGIN HEADER & CONTENT DIVIDER -->
	<div class="clearfix"></div>
	<!-- END HEADER & CONTENT DIVIDER -->
	<!-- BEGIN CONTAINER -->
	<div class="page-container">
		<!-- BEGIN SIDEBAR -->
		<div class="page-sidebar-wrapper">
			<!-- BEGIN SIDEBAR -->
			<div class="page-sidebar navbar-collapse  overhi" >
			
				<ul
					class="page-sidebar-menu  page-header-fixed page-sidebar-menu-light"
					data-keep-expanded="false" data-auto-scroll="true"
					data-slide-speed="200" style="padding-top: 0px">
					<li class="sidebar-toggler-wrapper hide">
						<div class="sidebar-toggler">
							<span></span>
						</div> 
					</li>

					<li class="sidebar-search-wrapper">
						<form class="sidebar-search">
							<a href="javascript:;" class="remove"> <i class="icon-close"></i>
							</a>
							<div class="input-group">
								<input class="form-control" autocomplete="off"  spellcheck="false" placeholder="Search..." type="text" id="searchText">
								<span class="input-group-btn"> <a href="javascript:;"
									class="btn" onclick="searchMenu();"> <i class="icon-magnifier"></i>
								</a>
								</span>
							</div>
						</form> 
					</li>
				</ul>
				
				
				<%@include file="/WEB-INF/include/left_menu.jsp" %>
				
				
				<!-- END SIDEBAR MENU -->
			</div>
			<!-- END SIDEBAR -->
		</div>
		<!-- END SIDEBAR -->
		
		
		<div class="page-content-wrapper">
			<div class="page-content">
	
				<div class="page-bar">
					<ul class="page-breadcrumb">
						<!-- <li><a href="${ctx}/dynamicpage/dynamicIndex" target="mainFrame"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li> --> 
						<li><a href="${ctx}/dashboard/logChart" target="mainFrame"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li>
					</ul>
				</div>
				
		
				 <iframe id="mainFrame" name="mainFrame" width="100%" onload="changeFrameHeight()" frameborder="0" srcolling="no" style="background-color:#181818;">	
				 	<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
							<thead>
								<tr>
									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
								</tr>
							</thead>
							<tbody>
								<tr>
									<td></td>
								</tr>
							</tbody>
						</table>
			     </iframe>
				

			</div>
			<!-- END CONTENT BODY -->
		</div>
		<!-- END CONTENT -->

	</div>
	<!-- END CONTAINER -->


	<!-- BEGIN FOOTER -->
	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">
		<div class="page-footer-inner">
			CEIEC All Rights Reserved，CEIEC &copy;
		</div>
		<div class="scroll-to-top">
			<i class="icon-arrow-up"></i>
		</div>
	</div>
	<!-- END FOOTER -->
	<script type="text/javascript">
		var fullflag = false;
		// 全屏代码
		function fullScreen() {
			if(fullflag){
				exitFullScreen();
			}else{
				fullflag = true;
			    var elem = document.body;
			    if (elem.webkitRequestFullScreen) {
			        elem.webkitRequestFullScreen();
			    } else if (elem.mozRequestFullScreen) {
			        elem.mozRequestFullScreen();
			    } else if (elem.requestFullScreen) {
			        elem.requestFullscreen();
			    } else {
			        //notice.notice_show("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
			    }
			}
		}
		function exitFullScreen() {
			fullflag = false;
		    var elem = document;
		    if (elem.webkitCancelFullScreen) {
		        elem.webkitCancelFullScreen();
		    } else if (elem.mozCancelFullScreen) {
		        elem.mozCancelFullScreen();
		    } else if (elem.cancelFullScreen) {
		        elem.cancelFullScreen();
		    } else if (elem.exitFullscreen) {
		        elem.exitFullscreen();
		    } else {
		        //notice.notice_show("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
		    }
		}
	//window.onload = function() {
	//	fullScreen();//直接执行onclick中的函数就行
	//}
	</script>
</body>


</html>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								<%@ page language="java" contentType="text/html; charset=UTF-8"
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+									pageEncoding="UTF-8"%>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								<%@ include file="/WEB-INF/include/taglib.jsp"%>
 								<!DOCTYPE html>
 								<html>
 								<head>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
-												更新浏览器tab页的logo
											
										
										
											2018-12-19 16:51:04 +08:00
+								<link rel="shortcut icon" href="${pageContext.request.contextPath}/static/pages/img/logo-K.ico" />
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 								<title>${fns:getStringProperty('productName','NIS')}</title>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+								<script src="${pageContext.request.contextPath}/static/pages/scripts/home.js" type="text/javascript"></script>
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
+								<script type="text/javascript">
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+									$(document).ready(function() {
 										//$(".page-bar").addClass("hidden");
-												日志总量th动态替换
											
										
										
											2018-08-31 20:24:43 +08:00
+										sessionStorage.setItem("log_total","${log_total}");
 										sessionStorage.setItem("log_time_start","${log_time_start}");
 										sessionStorage.setItem("log_time_range","${log_time_range}");
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+										//window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex";
-												首页改成流量统计，导出图片改为js
											
										
										
											2018-11-15 10:32:17 +08:00
+										window.frames['mainFrame'].location="${ctx}/dashboard/logChart";
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
+										//国际化切换
 										var lang = "${cookie.Language.value }".toLowerCase();
 										var $obj;
 										if(lang=="" || lang.indexOf("en")!=-1) {
 											$obj = $("#en");
 										}else if(lang.indexOf("cn")!=-1) {
 											$obj = $("#cn");
 										}else if(lang.indexOf("ru")!=-1) {
 											$obj = $("#ru");
 										}
 										$("#lang_text").html($obj.html());
 										$obj.parent("li").addClass("hide");
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+										// === Search input typeahead === //
 										$('#searchText').typeahead({
 											source: function(query,process) {
 												var sourceArray = new Array();
 												$(".accordion:visible a[target='mainFrame']").each(function(){
 													sourceArray.push($(this).parents("li").attr("menu-name")+"_"+$(this).parents("li").attr("menu-id"));
 												})
 												return process(sourceArray)
 											},
 											setValue:function(item){
 											},
 											items: 8,
 											matcher:function(term){
 												var mod1 = pinyin.getPY_Header(term);
 												var mod2 = pinyin.getPY_All(term);
 												var mod3 = term;
 												var s1 = mod1.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
 												var s2 = mod2.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
 												var s3 = mod3.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
 												return (s1||s2||s3);
 											}
 										});
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+									  //  console(window.frames['mainFrame'].location);
 									    // if(window.frames['mainFrame'].location.search("/dynamicIndex/")!=-1){
 									    	//关闭菜单
 									     	//$('.page-sidebar .sidebar-toggler').click();
 									    	//f11全屏
 									    	//fullScreen();
 									 	//}
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+										$("#searchText").click(function(){
 											$(this).val("");
 										});
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
+									});
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+								//页面跳转函数 level:级别，1顶级，2有子级。name:菜单名称，有多级#间隔。url：访问路径。object：点击元素对象。
-、配置操作tag增加修改操作；2、音视频文件样例配置列表、表单界面、新增、修改功能涉及到functionService与functionRegion字典使用部分提交。
											
										
										
											2018-05-18 16:46:46 +08:00
+								function page_turn(id, functionId,level, name, url,obj){
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+									//$(".page-bar").removeClass("hidden");
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+									var $object = $("#menu_"+id);//点击当前级别
 									$(".page-sidebar li").filter(".active,.open").removeClass("active open");//删除选中样式
 									var $header = $(".page-breadcrumb");//添加头部信息
 									$(".page-breadcrumb").empty();
 									var parent_li = $object.parents("li");
 									var parent_parent_li = $object.parents("li").parents("li");
 									var breadcrumb = $(".accordion:visible").attr("menu-name");
 									if(level==1){//一级菜单
 										breadcrumb += "#"+$object.attr("menu-name");
 									}else if(level==2){//二级菜单
 										parent_li.addClass("active open");
 										breadcrumb += "#"+parent_li.attr("menu-name")+"#"+$object.attr("menu-name");
 									}else if(level==3){//三级
 										parent_li.addClass("active open");
 										parent_parent_li.addClass("active open");
 										breadcrumb += "#"+parent_parent_li.attr("menu-name")+"#"+parent_li.attr("menu-name")+"#"+$object.attr("menu-name");
 									}
 									$object.addClass("active");
 									$header.append("<li><a href='index.html'><spring:message code='home'></spring:message></a> <i class='fa fa-circle'></i></li>");
 									var breadcrumbs = breadcrumb.split("#");
 									for(var i=0;i<breadcrumbs.length;i++) {
 										var circle="";
 										if(i!=breadcrumbs.length-1) {
 											circle = " <i class='fa fa-circle'></i>";
 										}
 										$header.append("<li><a href='javascript:void(0);'>"+breadcrumbs[i]+"</a>"+circle+"</li>");
 									}
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
 								    App.scrollTo()
-.voip新增默认显示配置form
											
										
										
											2018-08-31 18:14:44 +08:00
+								    //日志增加遮罩层
 								// 	if(url.search("/nis/log/")!=-1){
 								// 		loading();
 								// 	}else{
 									    App.startPageLoading({animate:true});
 								// 	}
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+								    //if(url.search("/dynamicIndex/")!=-1){
 								    // 	$('.page-sidebar .sidebar-toggler').click();
 								 	//}
-												流量统计新增端口，主题图
											
										
										
											2018-09-21 20:34:48 +08:00
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+									//调入页面
-、配置操作tag增加修改操作；2、音视频文件样例配置列表、表单界面、新增、修改功能涉及到functionService与functionRegion字典使用部分提交。
											
										
										
											2018-05-18 16:46:46 +08:00
+									if(url.indexOf("?")>0){
 										url = url+"&functionId="+functionId;
 									}else{
 										url = url+"?functionId="+functionId;
 									}
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+									window.frames['mainFrame'].location=url;
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
 								    $("#mainFrame").load(function(){
 								    	 App.stopPageLoading();
 								    });
 								}
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
+								function searchMenu() {
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
+									if ($('body').hasClass("page-sidebar-closed")) {
 								        if ($('.sidebar-search').hasClass('open') === false) {
 								            if ($('.page-sidebar-fixed').size() === 1) {
 								                $('.page-sidebar .sidebar-toggler').click(); //trigger sidebar toggle button
 								            }
 								            $('.sidebar-search').addClass("open");
 								        } else {
 								          searchForm();
 								        }
 								    } else {
 								    	searchForm()
 								    }
 								    if ($('.sidebar-search').size() !== 0) {
 								        $('.sidebar-search .input-group').on('click', function(e){
 								            e.stopPropagation();
 								        });
 								        $('body').on('click', function() {
 								            if ($('.sidebar-search').hasClass('open')) {
 								                $('.sidebar-search').removeClass("open");
 								            }
 								        });
 								    }
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+								}
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
 								function searchForm() {
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
+									 var search_txt = $("#searchText").val();
 										if(search_txt.indexOf('_')!=-1){
 											search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
 											$("#menu"+search_txt+" >a").trigger('click');
 										}else {
 											alert('未找到该菜单！');
 										}
 								}
 								function changeFrameHeight() {
 									var iframe = $("#mainFrame");
 									var clientHeight = $(window).height();
 									var headerHeight = $(".page-header").height();
 									var barHeight = $(".page-bar").height();
 									var footerHeight = $(".page-footer").height();
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+									//var paddingHeight  =  20;
 									//update for dynamicHomePage S
 									var paddingHeight = 11;
 									//update for dynamicHomePage E
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
 									iframe.contents().find(".page-content").addClass("page-content-body");
 									iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight);
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+									menuHeight();
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
+								}
 								window.onresize=function(){
 									changeFrameHeight();
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+									menuHeight();
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+								}
-												页面左上角显示当前位置
											
										
										
											2018-03-13 15:09:53 +08:00
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+								function  menuHeight(){
 									var height=document.documentElement.clientHeight;
 									if($('.overhi')){
 										$('.overhi').css({'height':height-82+'px'});
 										$('.page-content-wrapper').css({'height':height-82+'px'});
 									}
 								}
-												admin用户增加清理系统功能业务字典缓存的功能
											
										
										
											2018-09-23 15:32:00 +08:00
+								function refreshCache(cacheName){
 									$.ajax({
 										type:'post',
 										url:'${ctx}/sys/dict/refreshCache',
 										data:{"cacheName":cacheName},
 										dataType:'text',
 										async:false,
 										success:function(data,textStatus){
 											if(data=="success"){
 												alert("缓存清理成功");
 											}else{
 												alert("缓存清理失败");
 											}
 										}
 									})
 								}
-												配置清理，增加vpn信息清理
dns欺骗增加一个初始化无策略-默认组-欺骗ip配置(存储+下发)
											
										
										
											2018-12-12 11:48:52 +08:00
+								function initSpoofingIp(){
 									$.ajax({
 										type:'post',
 										url:'${ctx}/cfg/dnsIp/initSpoofingIp',
 										dataType:'text',
 										async:false,
 										success:function(data,textStatus){
 											if(data=="success"){
 												alert("success");
 											}else{
 												alert(data);
 											}
 										}
 									})
 								}
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
+								</script>
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+								<style type="text/css">
 								.bodyhi{
 								  overflow: hidden;
 								}
 								.overhi{
 								    overflow-y: auto;
 								    overflow-x: hidden;
 								}
-												提交ysp的帮助页面
											
										
										
											2018-11-07 15:07:10 +08:00
+								#helpHref{
 								padding:16px 6px 13px 8px;
 								color:#c5c5c5
 								}
 								#helpHref:hover{
 								background:#3d3d3d;
 								}
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+								</style>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								</head>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+								<body class="page-header-fixed page-sidebar-closed-hide-logo page-content-white bodyhi">
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+									<!-- BEGIN HEADER -->
 									<div class="page-header navbar navbar-fixed-top">
 										<!-- BEGIN HEADER INNER -->
 										<div class="page-header-inner ">
 											<!-- BEGIN LOGO -->
 											<div class="page-logo">
 												<a href="index.html"> <img
-.更新登录页logo和首页左上角logo
2.流量统计页面新样式，涉及3个加了new后缀的文件，现场根据需要去掉_new即可使用：
* static/pages/scripts/echart.js_new
* static/pages/css/data_text.css_new
* views/dashboard/dashBoardIndex.jsp_new
											
										
										
											2018-12-19 16:05:05 +08:00
+													src="${pageContext.request.contextPath}/static/layouts/layout/img/logo2-K.png"
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+													alt="logo" class="logo-default" />
 												</a>
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+												<!-- <button type="button"  onclick="javascript:fullScreen();">a</button> -->
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
 												<div class="menu-toggler sidebar-toggler">
 								                     <span></span>
 								                 </div>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+											</div>
 											<!-- END LOGO -->
 											<!-- BEGIN MEGA MENU -->
 											<div class="hor-menu  hidden-sm hidden-xs">
 												<ul class="nav navbar-nav mega-menu">
 										           <c:forEach items="${fns:getMenuTreeList()}" var="menu" varStatus="idxStatus">
 										           		<c:if test="${menu.isTop eq 1 && menu.isShow eq 1}">
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+												  			<li>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+													  			<c:choose>
 													  				<c:when test="${not empty menu.children and menu.children[0].isTop eq 1 }">
-												修改顶部菜单内容过长时截取

Signed-off-by: zhangwei <zhangwei@intranet.com>
											
										
										
											2018-07-11 18:00:13 +08:00
+													  					<a href="javascript:;" id="${menu.id}" data-hover="megamenu-dropdown" data-close-others="true"
 													  						data-original-title="<spring:message code="${menu.code}"/>" class="tooltips" data-placement="right">
 															  				<%-- ${menu.name } --%><%-- <spring:message code="${menu.code}"></spring:message> --%>
 															  				<c:set var="menuName" ><spring:message code='${menu.code}'/></c:set>
-												修改仿冒IP相关功能属性的默认值，以及顶部菜单的字数截取限制
											
										
										
											2018-12-18 13:09:22 +06:00
+															  				${fns:abbr(menuName,50) }
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+															  				<i class="fa fa-angle-down"></i>
 														  				</a>
 														  				<ul class="dropdown-menu pull-left">
 												          					<c:forEach  items="${menu.children}" var="secondMenu" varStatus="secondStatus">
 												          						<c:if test="${secondMenu.isTop eq 1 && secondMenu.isShow eq 1}">
-												修改top部分菜单样式，以及新增/删除配置区域的操作按钮样式
											
										
										
											2018-06-20 10:49:18 +08:00
+												          							<%-- <c:if test="${secondStatus.index==2}">
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												          								<li class="divider"></li>
-												修改top部分菜单样式，以及新增/删除配置区域的操作按钮样式
											
										
										
											2018-06-20 10:49:18 +08:00
+												          							</c:if> --%>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												          							<li>
 												          								<a href="javascript:;" id="${secondMenu.id}">
-												图标相关修改
											
										
										
											2018-04-17 17:00:50 +08:00
+												          									<i class="${secondMenu.icon }"></i>&nbsp;
-												菜单名称国际化处理
											
										
										
											2018-02-06 10:40:59 +08:00
+												          									<%-- ${secondMenu.name } --%><spring:message code="${secondMenu.code}"></spring:message>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												          								</a>
 												          							</li>
-												修改top部分菜单样式，以及新增/删除配置区域的操作按钮样式
											
										
										
											2018-06-20 10:49:18 +08:00
+												          							<li class="divider"></li>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												          						</c:if>
 												          					</c:forEach>
 											          					</ul>
 													  				</c:when>
 													  				<c:otherwise>
-												顶部菜单鼠标悬停提示改为底部.
											
										
										
											2018-10-08 10:36:02 +08:00
+													  					<a href="javascript:;" id="${menu.id}" data-original-title="<spring:message code="${menu.code}"/>" class="tooltips" data-placement="bottom">
-												修改顶部菜单内容过长时截取

Signed-off-by: zhangwei <zhangwei@intranet.com>
											
										
										
											2018-07-11 18:00:13 +08:00
+															  				<%-- ${menu.name } --%><%-- <spring:message code="${menu.code}"></spring:message> --%>
 															  				<c:set var="menuName" ><spring:message code='${menu.code}'/></c:set>
-												修改仿冒IP相关功能属性的默认值，以及顶部菜单的字数截取限制
											
										
										
											2018-12-18 13:09:22 +06:00
+															  				${fns:abbr(menuName,50) }
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+														  				</a>
 													  				</c:otherwise>
 													  			</c:choose>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+												  			</li>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												  	    </c:if>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								          			</c:forEach>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
 									           </ul>
 											</div>
 											<!-- END MEGA MENU -->
-												配置列国际化添加
											
										
										
											2018-12-24 22:06:34 +08:00
+											<input type="hidden"  id="tb_custom" value="<spring:message code='cfg_custom'/>"/>
-												业务配置添加日志趋势图
js国际化添加日志趋势
											
										
										
											2019-01-15 18:49:28 +08:00
+											<input type="hidden"  id="jbox_cfg_url" value="${ctx}/toLogSearch/logTrend"/>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+											<!-- BEGIN TOP NAVIGATION MENU -->
 											<div class="top-menu">
 												<ul class="nav navbar-nav pull-right">
-												修改系统超级管理员的登录账号为ceiec，原有admin账号作为普通管理员使用。
											
										
										
											2018-12-28 17:40:25 +06:00
+													<c:if test="${fns:getUser().isAdmin()}">
-												admin用户增加清理系统功能业务字典缓存的功能
											
										
										
											2018-09-23 15:32:00 +08:00
+														<li  class="dropdown  dropdown-user" id="cache">
 															<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" >
-												增加在线帮助
											
										
										
											2018-11-07 13:48:19 +08:00
+									                         	<i class="fa fa-language"></i><span class="username username-hide-on-mobile" id="cache_text"> clear cache  </span>
-												admin用户增加清理系统功能业务字典缓存的功能
											
										
										
											2018-09-23 15:32:00 +08:00
+									                         </a>
 															<ul class="dropdown-menu">
 																<li>
 																	<a href="javascript:refreshCache('functionServiceDict')">refresh function service</a>
 																</li>
 																<li>
 																	<a href="javascript:refreshCache('functionRegionDict')">refresh function region</a>
 																</li>
-												添加清理asn号缓存的方法
											
										
										
											2018-11-21 17:22:59 +08:00
+																<li>
 																	<a href="javascript:refreshCache('asnNoCache')">refresh ASN no</a>
 																</li>
-												配置清理，增加vpn信息清理
dns欺骗增加一个初始化无策略-默认组-欺骗ip配置(存储+下发)
											
										
										
											2018-12-12 11:48:52 +08:00
+																<li>
 																	<a href="javascript:initSpoofingIp()">Init Spoofing Ip</a>
 																</li>
-												admin用户增加清理系统功能业务字典缓存的功能
											
										
										
											2018-09-23 15:32:00 +08:00
+															</ul>
 														</li>
 													</c:if>
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+													<li class="dropdown  dropdown-user nav">
 								                         <a href="${pageContext.request.contextPath}/static/PotPlayerSetup64.exe" id="helpHref"  target="_self" >
 								                         	<i class="fa fa-cloud-download"></i>
 								                         	<span class="username username-hide-on-mobile" id="help">
-.修改app策略与隧道行为表单的doLog参数位置；
2.修改p2p表单的doLog默认选中；
3.修改主页的音视频样例剪切工具国际化与帮助信息页面的国际化链接
											
										
										
											2019-01-13 11:11:23 +06:00
+								                         		<spring:message code="cut_sample_tool" />
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+								                         	</span>
 								                         </a>
 								                     </li>
-												增加在线帮助
											
										
										
											2018-11-07 13:48:19 +08:00
+													<!-- 在线帮助 -->
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+													<li class="dropdown  dropdown-user nav">
-												提交ysp的帮助页面
											
										
										
											2018-11-07 15:07:10 +08:00
+								                         <a href="${ctx}/sys/help" id="helpHref"  target="mainFrame" >
-												增加在线帮助
											
										
										
											2018-11-07 13:48:19 +08:00
+								                         	<i class="icon-question  font-sharp"></i>
 								                         	<span class="username username-hide-on-mobile" id="help">
-												log_total链接加到配置ID上
实时报表-合计所有数据
mail和ftp选block时隐藏内容封堵

											
										
										
											2018-12-05 15:32:50 +08:00
+								                         		<spring:message code="help" />
-												增加在线帮助
											
										
										
											2018-11-07 13:48:19 +08:00
+								                         	</span>
 								                         </a>
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+								                     </li>
-												增加在线帮助
											
										
										
											2018-11-07 13:48:19 +08:00
+								                     <!-- 系统语言 -->
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												     <li class="dropdown  dropdown-user" id="language">
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
-												界面样式调整
											
										
										
											2018-04-04 18:17:53 +08:00
+								                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" >
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
+								                         	<i class="fa fa-language"></i><span class="username username-hide-on-mobile" id="lang_text">  </span>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+								                         </a>
 								                         <ul class="dropdown-menu">
-												国际化选项切换功能
											
										
										
											2018-02-06 21:39:59 +08:00
+								                    	   <li><a href="${pageContext.request.contextPath}/language?language=zh_CN" id="cn">&nbsp;简体中文&nbsp;</a></li>
 								                           <li><a href="${pageContext.request.contextPath}/language?language=en" id="en">&nbsp;English&nbsp;</a></li>
 														   <li><a href="${pageContext.request.contextPath}/language?language=ru" id="ru">&nbsp;русский язык&nbsp;</a></li>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+								                         </ul>
 								                     </li>
 													<!-- BEGIN USER LOGIN DROPDOWN -->
 													<li class="dropdown dropdown-user"><a href="javascript:;"
 														class="dropdown-toggle" data-toggle="dropdown"
-												头像显示
											
										
										
											2018-08-10 20:43:15 +08:00
+														data-close-others="true">
 														<img alt="" class="img-circle" src=${fns:getUser().photo }/>
 								<%-- 							src="${pageContext.request.contextPath}/static/pages/img/avatar.png" /> --%>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+															<span class="username username-hide-on-mobile">
 																${fns:getUser().name}</span> <i class="fa fa-angle-down"></i>
 													</a>
 														<ul class="dropdown-menu dropdown-menu-default">
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+															<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; <spring:message code="userInfo"></spring:message></a></li>
 															<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; <spring:message code="updatePwd"></spring:message></a></li>
-.修改用户，角色中的国际化2.修改用户角色新增已经删除角色报错
											
										
										
											2018-08-08 13:22:34 +08:00
+															<li><a href="${pageContext.request.contextPath }/logout" >
-.首页面退出操作字体未对齐
2.基本配置-用户管理-新增用户bug
3.ASN IP配置导出bug(实际为公共界面所有超过阈值导出共性BUG)
4.ASN IP下拉框onchange事件

(cherry picked from commit 355fa8e3cba9c66b54ebcdf1acd99c2e8ac1ca67)
											
										
										
											2019-01-27 08:24:39 +00:00
+																<i class="icon-key"></i>&nbsp;  <spring:message code="exit"></spring:message></a></li>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+														</ul></li>
 													<!-- END USER LOGIN DROPDOWN -->
 												</ul>
 											</div>
 											<!-- END TOP NAVIGATION MENU -->
 										</div>
 										<!-- END HEADER INNER -->
 									</div>
 									<!-- END HEADER -->
 									<!-- BEGIN HEADER & CONTENT DIVIDER -->
 									<div class="clearfix"></div>
 									<!-- END HEADER & CONTENT DIVIDER -->
 									<!-- BEGIN CONTAINER -->
 									<div class="page-container">
 										<!-- BEGIN SIDEBAR -->
 										<div class="page-sidebar-wrapper">
 											<!-- BEGIN SIDEBAR -->
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+											<div class="page-sidebar navbar-collapse  overhi" >
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												<ul
 													class="page-sidebar-menu  page-header-fixed page-sidebar-menu-light"
 													data-keep-expanded="false" data-auto-scroll="true"
 													data-slide-speed="200" style="padding-top: 0px">
 													<li class="sidebar-toggler-wrapper hide">
 														<div class="sidebar-toggler">
 															<span></span>
 														</div>
 													</li>
 													<li class="sidebar-search-wrapper">
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+														<form class="sidebar-search">
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+															<a href="javascript:;" class="remove"> <i class="icon-close"></i>
 															</a>
 															<div class="input-group">
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+																<input class="form-control" autocomplete="off"  spellcheck="false" placeholder="Search..." type="text" id="searchText">
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+																<span class="input-group-btn"> <a href="javascript:;"
-、已解决左侧菜单当前操作菜单无选中样式；
2、已解决左侧菜单搜索功能无效；
3、已解决主界面左上角菜单导航未正确标记当前菜单位置；
4、已解决主界面的搜索条件区域，必须点开“筛选”，才能找到搜索按钮；
											
										
										
											2018-03-18 14:57:48 +08:00
+																	class="btn" onclick="searchMenu();"> <i class="icon-magnifier"></i>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+																</a>
 																</span>
 															</div>
 														</form>
 													</li>
 												</ul>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+												<%@include file="/WEB-INF/include/left_menu.jsp" %>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
 												<!-- END SIDEBAR MENU -->
 											</div>
 											<!-- END SIDEBAR -->
 										</div>
 										<!-- END SIDEBAR -->
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+										<div class="page-content-wrapper">
 											<div class="page-content">
 												<div class="page-bar">
 													<ul class="page-breadcrumb">
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+														<!-- <li><a href="${ctx}/dynamicpage/dynamicIndex" target="mainFrame"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li> -->
-												首页改成流量统计，导出图片改为js
											
										
										
											2018-11-15 10:32:17 +08:00
+														<li><a href="${ctx}/dashboard/logChart" target="mainFrame"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+													</ul>
 												</div>
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+												 <iframe id="mainFrame" name="mainFrame" width="100%" onload="changeFrameHeight()" frameborder="0" srcolling="no" style="background-color:#181818;">
-												首页增加配置统计列表
											
										
										
											2018-07-11 16:15:23 +08:00
+												 	<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 															<thead>
 																<tr>
 																	<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 																</tr>
 															</thead>
 															<tbody>
 																<tr>
 																	<td></td>
 																</tr>
 															</tbody>
 														</table>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+											     </iframe>
 											</div>
 											<!-- END CONTENT BODY -->
 										</div>
 										<!-- END CONTENT -->
 									</div>
 									<!-- END CONTAINER -->
 									<!-- BEGIN FOOTER -->
-												界面滚动条优化
											
										
										
											2018-09-13 20:10:28 +08:00
+									<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+										<div class="page-footer-inner">
-												增加ceiec标
修改policyGroupList注释<!---->为<%----%>
											
										
										
											2018-07-19 20:09:49 +08:00
+											CEIEC All Rights Reserved，CEIEC &copy;
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
+										</div>
 										<div class="scroll-to-top">
 											<i class="icon-arrow-up"></i>
 										</div>
 									</div>
 									<!-- END FOOTER -->
-												home.jsp合并冲突，有关首页代码已经注掉
											
										
										
											2018-12-15 11:30:08 +08:00
+									<script type="text/javascript">
 										var fullflag = false;
 										// 全屏代码
 										function fullScreen() {
 											if(fullflag){
 												exitFullScreen();
 											}else{
 												fullflag = true;
 											    var elem = document.body;
 											    if (elem.webkitRequestFullScreen) {
 											        elem.webkitRequestFullScreen();
 											    } else if (elem.mozRequestFullScreen) {
 											        elem.mozRequestFullScreen();
 											    } else if (elem.requestFullScreen) {
 											        elem.requestFullscreen();
 											    } else {
 											        //notice.notice_show("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
 											    }
 											}
 										}
 										function exitFullScreen() {
 											fullflag = false;
 										    var elem = document;
 										    if (elem.webkitCancelFullScreen) {
 										        elem.webkitCancelFullScreen();
 										    } else if (elem.mozCancelFullScreen) {
 										        elem.mozCancelFullScreen();
 										    } else if (elem.cancelFullScreen) {
 										        elem.cancelFullScreen();
 										    } else if (elem.exitFullscreen) {
 										        elem.exitFullscreen();
 										    } else {
 										        //notice.notice_show("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
 										    }
 										}
 									//window.onload = function() {
 									//	fullScreen();//直接执行onclick中的函数就行
 									//}
 									</script>
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								</body>
-												界面框架初步提交
											
										
										
											2018-02-02 17:58:32 +08:00
-												项目初始导入
											
										
										
											2017-12-29 16:18:40 +08:00
+								</html>