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:
tanghao
2018-12-24 19:46:58 +08:00
parent 1398974c2a 833363b637
commit 6a4e5f7959
6 changed files with 122 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -68,10 +68,22 @@
<button type="button" class="btn btn-default" onclick="edit(${taskInfo.functionId})">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
<sys:delRow url="${ctx}/basics/taskInfo/delete?functionId=${taskInfo.functionId}" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/basics/taskInfo/exportTaskInfo?functionId=${taskInfo.functionId}" searchUrl="${ctx}/basics/taskInfo/list?functionId=${taskInfo.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<%-- <sys:delRow url="${ctx}/basics/taskInfo/exportTaskInfo?functionId=${taskInfo.functionId}" searchUrl="${ctx}/basics/taskInfo/list?functionId=${taskInfo.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
</shiro:hasPermission>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;" >
<li><sys:delRow url="${ctx}/basics/taskInfo/exportTaskInfo?functionId=${taskInfo.functionId}&exType=excel" searchUrl="${ctx}/basics/taskInfo/list?functionId=${taskInfo.functionId}" id="contentTable" maxRow="10000" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/basics/taskInfo/exportTaskInfo?functionId=${taskInfo.functionId}&exType=csv" searchUrl="${ctx}/basics/taskInfo/list?functionId=${taskInfo.functionId}" id="contentTable" maxRow="10000" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="basics:taskInfo:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -162,17 +174,17 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="task_name"></spring:message></th>
<th><spring:message code="task_org"></spring:message></th>
<th><spring:message code="task_time"></spring:message></th>
<th><spring:message code="state"></spring:message></th>
<th><spring:message code="desc"></spring:message></th>
<th><spring:message code="creator"></spring:message></th>
<th class="sort-column createTime"><spring:message code="create_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column editTime"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"></spring:message></th>
<th class="sort-column auditTime"><spring:message code="audit_time"></spring:message></th>
<th column="task_name" ><spring:message code="task_name"></spring:message></th>
<th column="task_org" ><spring:message code="task_org"></spring:message></th>
<th column="task_time" ><spring:message code="task_time"></spring:message></th>
<th column="state" ><spring:message code="state"></spring:message></th>
<th column="desc" ><spring:message code="desc"></spring:message></th>
<th column="creator" ><spring:message code="creator"></spring:message></th>
<th column="create_time" class="sort-column createTime"><spring:message code="create_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column editTime"><spring:message code="edit_time"/></th>
<th column="auditor" ><spring:message code="auditor"></spring:message></th>
<th column="audit_time" class="sort-column auditTime"><spring:message code="audit_time"></spring:message></th>
</tr>
</thead>
<tbody>

4
src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
View File

@@ -116,7 +116,7 @@ $(document).ready(function(){
$("#beginDate").val(starth);
$("#endDate").val(endh);
ipActiveMinuteList(starth,endh);
// ipActiveOneHourList(starth,endh);
ipActiveOneHourList(starth,endh);
//筛选功能初始化
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
@@ -159,7 +159,7 @@ function searchList(){
window.location.reload();
}else{
ipActiveMinuteList(start,end);
// ipActiveOneHourList(start,end);
ipActiveOneHourList(start,end);
}
}