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

1.修改国际化代码 2.解决界面搜索框Clear按钮失效 3.日志串联设备字典取

Browse Source
This commit is contained in:
zhangwenqing
2018-08-10 11:49:00 +08:00
parent f4f1600509
commit 44dfbe1e79
12 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/messages/message_en.properties
View File

@@ -391,6 +391,7 @@ protocol_code=Protocol No
protocol_name=Protocol Name protocol_name=Protocol Name
group_id=Configuration Group ID group_id=Configuration Group ID
input_protocol_id=Please enter protocol ID input_protocol_id=Please enter protocol ID
input_protocol_name=Please enter protocol name
input_integer=Please enter correct Number input_integer=Please enter correct Number
protocol_desc=Protocol Description protocol_desc=Protocol Description
max_value=The maximum value should not be greater than max_value=The maximum value should not be greater than

1
src/main/resources/messages/message_zh_CN.properties
View File

@@ -391,6 +391,7 @@ protocol_code=\u534F\u8BAE\u53F7
protocol_name=\u534F\u8BAE\u540D\u79F0 protocol_name=\u534F\u8BAE\u540D\u79F0
group_id=\u914D\u7F6E\u5206\u7EC4ID group_id=\u914D\u7F6E\u5206\u7EC4ID
input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID
input_protocol_name=\u8BF7\u8F93\u5165\u534F\u8BAE\u540D\u79F0
input_integer=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6574\u6570\u503C input_integer=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6574\u6570\u503C
protocol_desc=\u534F\u8BAE\u63CF\u8FF0 protocol_desc=\u534F\u8BAE\u63CF\u8FF0
max_value=\u6700\u5927\u503C\u4E0D\u5F97\u8D85\u8FC7 max_value=\u6700\u5927\u503C\u4E0D\u5F97\u8D85\u8FC7

5
src/main/webapp/WEB-INF/tags/sys/treeselect.tag
View File

@@ -114,13 +114,12 @@
} }
$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
$("#${id}Name").val(names.join(",")); $("#${id}Name").val(names.join(","));
}//<c:if test="${allowClear}"> }else if (v == "clear"){
else if (v=="clear"){
$("#${id}Id").val(""); $("#${id}Id").val("");
$("#${id}Id").removeAttr('cfgtype'); $("#${id}Id").removeAttr('cfgtype');
$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
$("#${id}Name").val(""); $("#${id}Name").val("");
}//</c:if> }
if(typeof ${id}TreeselectCallBack == 'function'){ if(typeof ${id}TreeselectCallBack == 'function'){
${id}TreeselectCallBack(v, h, f); ${id}TreeselectCallBack(v, h, f);
} }

8
src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
View File

@@ -228,7 +228,13 @@
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<td>${log.deviceId}</td> <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if> <c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>

8
src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
View File

@@ -240,7 +240,13 @@ $(document).ready(function(){
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<%--<td>${log.deviceId}</td> <%--<td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if> <c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>

8
src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
View File

@@ -240,7 +240,13 @@ $(document).ready(function(){
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<%-- <td>${log.deviceId}</td> <%-- <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if> <c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>

8
src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
View File

@@ -300,7 +300,13 @@
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<%-- <td>${log.deviceId}</td> <%-- <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if> <c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>

8
src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
View File

@@ -238,7 +238,13 @@ $(document).ready(function(){
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<%-- <td>${log.deviceId}</td> <%-- <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if> <c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>

8
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
View File

@@ -240,7 +240,13 @@ $(document).ready(function(){
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<%-- <td>${log.deviceId}</td> <%-- <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if> <c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>

8
src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
View File

@@ -224,7 +224,13 @@
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<td>${log.deviceId}</td> <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if> <c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>

12
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -52,7 +52,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small"> <form:select path="action" class="selectpicker select2 input-small">
<form:option value="" ><spring:message code="action"/></form:option> <form:option value="" disabled="disabled" ><spring:message code="action"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action"> <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }"> <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> <form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
@@ -195,7 +195,7 @@
<tbody> <tbody>
<c:forEach items="${page.list}" var="log" varStatus="status" step="1"> <c:forEach items="${page.list}" var="log" varStatus="status" step="1">
<tr> <tr>
<td>${log.cfgId} <td>${log.cfgId}9999999999
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td> </td>
<td> <td>
@@ -230,7 +230,13 @@
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td> <td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dPort}</td> <td>${log.dPort}</td>
<td>${log.sPort}</td> <td>${log.sPort}</td>
<td>${log.deviceId}</td> <td>
<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
<c:if test="${dict.itemCode eq log.deviceId}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if> <c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>

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

@@ -172,7 +172,7 @@
<option value="specServiceName"><spring:message code="protocol_name"/></option> <option value="specServiceName"><spring:message code="protocol_name"/></option>
</select> </select>
</div> </div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_name'/>" type="text" onchange="casec()" maxlength="60"> <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_name'/>" type="text" onchange="casec()" maxlength="60">
</div> </div>