gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

home.jsp合并冲突，有关首页代码已经注掉

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-15 11:30:08 +08:00
parent 06a6b9850a
commit 4aabb53ea7
1 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -10,13 +10,20 @@
<title>${fns:getStringProperty('productName','NIS')}</title>
<script src="${pageContext.request.contextPath}/static/pages/scripts/home.js" type="text/javascript"></script>
<style type="text/css">
#mainFrame:-webkit-full-screen {
/*background-color:rgb(255, 255, 12);*/
}
</style>
<script type="text/javascript">
$(document).ready(function() {
$(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();
@@ -58,7 +65,14 @@
}
});
// 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("");
});
@@ -67,6 +81,7 @@
//页面跳转函数 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");//删除选中样式
@@ -111,9 +126,9 @@ function page_turn(id, functionId,level, name, url,obj){
// }else{
App.startPageLoading({animate:true});
// }
// if(url.search("/nis/dashboard/")!=-1){
// $('.page-sidebar .sidebar-toggler').click();
// }
//if(url.search("/dynamicIndex/")!=-1){
// $('.page-sidebar .sidebar-toggler').click();
//}
//调入页面
if(url.indexOf("?")>0){
@@ -178,7 +193,10 @@ function changeFrameHeight() {
var headerHeight = $(".page-header").height();
var barHeight = $(".page-bar").height();
var footerHeight = $(".page-footer").height();
var paddingHeight = 20;
//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);
@@ -260,6 +278,7 @@ background:#3d3d3d;
src="${pageContext.request.contextPath}/static/layouts/layout/img/logo2.png"
alt="logo" class="logo-default" />
</a>
<!-- <button type="button" onclick="javascript:fullScreen();">a</button> -->
<div class="menu-toggler sidebar-toggler">
<span></span>
@@ -353,15 +372,23 @@ background:#3d3d3d;
</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">
<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>
<!-- 系统语言 -->
<li class="dropdown dropdown-user" id="language">
@@ -459,12 +486,13 @@ background:#3d3d3d;
<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">
<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>
@@ -500,6 +528,45 @@ background:#3d3d3d;
</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>