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

switchIpInfo初始化提至common.js

Browse Source 
去掉所有list界面的分类、标签、性质的末尾逗号
This commit is contained in:
duandongmei
2018-05-25 18:25:42 +08:00
parent bbd0aeeee8
commit cd1cb600b9
9 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -30,7 +30,6 @@ import com.nis.web.controller.BaseController;
@RequestMapping("${adminPath}/ntc/av") @RequestMapping("${adminPath}/ntc/av")
public class AvContentController extends BaseController { public class AvContentController extends BaseController {
//音视频VOIP配置新增界面 //音视频VOIP配置新增界面
@RequestMapping(value = {"/voipForm"}) @RequestMapping(value = {"/voipForm"})
public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo cfg){ public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo cfg){
@@ -117,4 +116,19 @@ public class AvContentController extends BaseController {
return voipAndAccountInfoMap; return voipAndAccountInfoMap;
} }
//视频文本内容配置列表
@RequestMapping(value = {"/contIpList"})
public String contIpList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo entity){
if(entity.getVoipIp()== null){
entity.setVoipIp(new AvVoipIpCfg());
}
if(entity.getVoipAccount()== null){
entity.setVoipAccount(new AvVoipAccountCfg());
}
Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
return "/cfg/av/voip/voipList";
}
} }

20
src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
View File

@@ -370,26 +370,32 @@
<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if> <c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId"> <c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
<c:forEach items="${fls}" var="fl"> <c:forEach items="${fls}" var="fl">
<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}"> <c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
${fl.itemValue}, ${fl.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(cfg.classify,','))}">,</c:if>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
${classifyName[status]}
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId"> <c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
<c:forEach items="${xzs}" var="xz"> <c:forEach items="${xzs}" var="xz">
<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if> <c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
${xz.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(cfg.attribute,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId"> <c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
<c:forEach items="${lables}" var="lable"> <c:forEach items="${lables}" var="lable">
<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if> <c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
${lable.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(cfg.lable,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>

15
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -4,8 +4,6 @@
<head> <head>
<title><spring:message code="${cfgName}"></spring:message></title> <title><spring:message code="${cfgName}"></spring:message></title>
<!-- BEGIN THEME GLOBAL STYLES --> <!-- BEGIN THEME GLOBAL STYLES -->
<link href="${pageContext.request.contextPath}/static/global/css/components.css" rel="stylesheet" id="style_components" type="text/css" />
<script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
<style type="text/css"> <style type="text/css">
.boxSolid{ .boxSolid{
border:1px solid #eeeeee border:1px solid #eeeeee
@@ -13,19 +11,6 @@ border:1px solid #eeeeee
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$("select[name$='ipType']").each(function(){
switchIpInfo(this,"ipType");
})
$("select[name$='ipType']").on("change",function(){
switchIpInfo(this,"ipType");
});
$("select[name$='ipPattern']").on("change",function(){
switchIpInfo(this,"ipPattern");
});
$("select[name$='portPattern']").on("change",function(){
switchIpInfo(this,"portPattern");
});
areaControlInit(); areaControlInit();
$("input[name='isAreaEffective']").on('change',function(){ $("input[name='isAreaEffective']").on('change',function(){
var val=$(this).val(); var val=$(this).val();

24
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -241,7 +241,7 @@
html+="</div>"; html+="</div>";
html+="<div class='col-md-4'>"; html+="<div class='col-md-4'>";
html+="<div class='form-group'>"; html+="<div class='form-group'>";
html+="<label><spring:message code='strong_string'/>：</label>"; html+="<label><spring:message code='district'/>：</label>";
html+="<label>" html+="<label>"
html+=item.district; html+=item.district;
html+="</label>"; html+="</label>";
@@ -655,26 +655,32 @@
</td> </td>
<td>${indexCfg.requestName }</td> <td>${indexCfg.requestName }</td>
<td> <td>
<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId"> <c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId" varStatus="status">
<c:forEach items="${fls}" var="fl"> <c:forEach items="${fls}" var="fl" >
<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}"> <c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
${fl.itemValue}, ${fl.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.classify,','))}">,</c:if>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
${classifyName[status]}
</td> </td>
<td> <td>
<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId"> <c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId" varStatus="status">
<c:forEach items="${xzs}" var="xz"> <c:forEach items="${xzs}" var="xz">
<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if> <c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
${xz.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.attribute,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId"> <c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId" varStatus="status">
<c:forEach items="${lables}" var="lable"> <c:forEach items="${lables}" var="lable">
<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if> <c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
${lable.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.lable,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>

20
src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
View File

@@ -325,26 +325,32 @@
</td> </td>
<td>${cfg.requestName }</td> <td>${cfg.requestName }</td>
<td> <td>
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId"> <c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
<c:forEach items="${fls}" var="fl"> <c:forEach items="${fls}" var="fl">
<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}"> <c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
${fl.itemValue}, ${fl.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(cfg.classify,','))}">,</c:if>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
${classifyName[status]}
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId"> <c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
<c:forEach items="${xzs}" var="xz"> <c:forEach items="${xzs}" var="xz">
<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if> <c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
${xz.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(cfg.attribute,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId"> <c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
<c:forEach items="${lables}" var="lable"> <c:forEach items="${lables}" var="lable">
<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if> <c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
${lable.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(cfg.lable,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>

22
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
View File

@@ -310,26 +310,32 @@
<td><fmt:formatDate value="${dnsIpCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%> <td><fmt:formatDate value="${dnsIpCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%>
<td>${dnsIpCfg.request.requestTitle }</td> <td>${dnsIpCfg.request.requestTitle }</td>
<td> <td>
<c:forEach items="${fn:split(dnsIpCfg.classify,',')}" var="classifyId"> <c:forEach items="${fn:split(dnsIpCfg.classify,',')}" var="classifyId" varStatus="status">
<c:forEach items="${fls}" var="fl"> <c:forEach items="${fls}" var="fl">
<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}"> <c:if test="${fn:trim(fl.serviceDictId) eq classify}">
${fl.itemValue}, ${fl.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(dnsIpCfg.classify,','))}">,</c:if>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
${classifyName[status]}
</td> </td>
<td> <td>
<c:forEach items="${fn:split(dnsIpCfg.attribute,',')}" var="attributeId"> <c:forEach items="${fn:split(dnsIpCfg.attribute,',')}" var="attributeId" varStatus="status">
<c:forEach items="${xzs}" var="xz"> <c:forEach items="${xzs}" var="xz">
<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if> <c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">
${xz.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(dnsIpCfg.attribute,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fn:split(dnsIpCfg.lable,',')}" var="lableId"> <c:forEach items="${fn:split(dnsIpCfg.lable,',')}" var="lableId" varStatus="status">
<c:forEach items="${lables}" var="lable"> <c:forEach items="${lables}" var="lable">
<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if> <c:if test="${fn:trim(lable.serviceDictId) eq lableId}">
${lable.itemValue}
<c:if test="${status.index+1 ne fn:length(fn:split(dnsIpCfg.lable,','))}">,</c:if>
</c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</td> </td>

1
src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
View File

@@ -377,7 +377,6 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
${classifyName[status]}
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId"> <c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">

1
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -323,7 +323,6 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
${classifyName[status]}
</td> </td>
<td> <td>
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId"> <c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">

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

@@ -7,6 +7,19 @@ $(function(){
$("input.i-checks").prop("checked",false); $("input.i-checks").prop("checked",false);
} }
}); });
$("select[name$='ipType']").each(function(){
switchIpInfo(this);
})
$("select[name$='ipType']").on("change",function(){
switchIpInfo(this);
});
$("select[name$='ipPattern']").on("change",function(){
switchIpInfo(this);
});
$("select[name$='portPattern']").on("change",function(){
switchIpInfo(this);
});
}); });
var switchIpType=function(obj){ var switchIpType=function(obj){
var type=$(obj).val(); var type=$(obj).val();