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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
zhangwenqing
2019-01-03 11:52:01 +08:00
parent 2c66f541f8 6395b7d099
commit 7f2c494632
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,7 +193,7 @@ function changeFrameHeight() {
var paddingHeight = 11;
//update for dynamicHomePage E
iframe.contents().find(".page-content").addClass("page-content-body");
//iframe.contents().find(".page-content").addClass("page-content-body");
iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight);
menuHeight();
}

2
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -447,7 +447,7 @@ white-space:nowrap;
</style>
</head>
<body>
<div class="page-content">
<div class="page-content page-content-body">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<c:forEach items="${serviceList}" var="service" varStatus="status">
<c:if test="${(service.action ne 128) && (service.serviceId ne 37) && (service.serviceId ne 149)}" >