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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-08-02 14:48:53 +08:00
parent 9f798ec842 64e8676de5
commit 4819b2f6f7
6 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -180,7 +180,9 @@
<tbody>
<c:forEach var="_log" items="${page.list }" varStatus="status">
<tr>
<td>${_log.cfgId }</td>
<td>${_log.cfgId }
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>
<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if>
<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>

7
src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
View File

@@ -62,8 +62,11 @@ $(document).ready(function(){
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
<div class="pull-left">

7
src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
View File

@@ -62,8 +62,11 @@ $(document).ready(function(){
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
<div class="pull-left">

7
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
View File

@@ -62,8 +62,11 @@ $(document).ready(function(){
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
<div class="pull-left">

15
src/main/webapp/static/global/css/components.css
View File

@@ -22235,7 +22235,22 @@ Color library demo
padding-top:10px;
}
.logInfo {
padding-left:25px;
padding-top:10px;
}
.logInfo label {
padding-left: 5px;
cursor: pointer;
vertical-align: middle;
}
.customColumnList label {

21
src/main/webapp/static/global/scripts/common.js
View File

@@ -1,4 +1,25 @@
$(function(){
$("a[name=viewLogInfo]>i").on("click",function(){
var html = "<div class='logInfo'>";
$(this).parents("tr").find("td").each(function(index,element){
if(index >0){
var text="";
if($(element).find(".tooltips").length > 0){
text=$(element).find(".tooltips").attr("data-original-title").trim();
}else{
text=$(element).text().trim()
}
html+="<div class='row col-md-12'>";
html+="<div class='col-md-4'><label>"+$(".table tr th").eq(index).text().trim()+":</label></div>";
html+="<div class='col-md-6'><label>"+text+"</label></div>";
html+="</div>";
}
})
html +="</div>";
top.$.jBox(html,{height:400,width:400,title:"<i class='icon-book-open'></i> Log Info",showIcon:false,opacity:0.5});
})
var tree2 = $("select[name=lableTest]").treeMultiselect({
searchable: true,
hideSidePanel:true,