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

(1)特定服务搜索列表默认选择app

Browse Source 
(2)特定服务表单修改完成自动跳转到对应类型的表单上
(3)特定服务列表code,name,desc对应修改
(4)特定服务业务类型除了加密隧道行为，都加入搜索框
This commit is contained in:
wangxin
2018-08-30 12:57:27 +08:00
parent 721d719bf0
commit fa1f24c21f
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -73,6 +73,9 @@ public class SpecificServiceCfgController extends BaseController {
searchType = "groupId"; searchType = "groupId";
searchContent = specificServiceCfg.getGroupId().toString(); searchContent = specificServiceCfg.getGroupId().toString();
} }
if(specificServiceCfg.getCfgType()==null){
specificServiceCfg.setCfgType(1);
}
model.addAttribute("searchType", searchType); model.addAttribute("searchType", searchType);
model.addAttribute("searchContent", searchContent); model.addAttribute("searchContent", searchContent);
@@ -163,7 +166,7 @@ public class SpecificServiceCfgController extends BaseController {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes, "save_failed"); addMessage(redirectAttributes, "save_failed");
} }
return "redirect:" + adminPath + "/specific/specificServiceCfg/list"; return "redirect:" + adminPath + "/specific/specificServiceCfg/list?cfgType="+specificServiceCfg.getCfgType();
} }
/** /**

4
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -250,7 +250,7 @@
<c:if test="${dict.itemCode==1}"> <c:if test="${dict.itemCode==1}">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_business_type"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_business_type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<select id="businessType1" name="businessType" class="form-control required" data-live-search="true" data-live-search-placeholder="search"> <select id="businessType1" name="businessType" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict"> <c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict">
<option value="${dict.itemCode}" <option value="${dict.itemCode}"
@@ -263,7 +263,7 @@
<c:if test="${dict.itemCode==3}"> <c:if test="${dict.itemCode==3}">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="basic_protocol_business_type"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="basic_protocol_business_type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<select id="businessType3" name="businessType" class="form-control required" data-live-search="true" data-live-search-placeholder="search"> <select id="businessType3" name="businessType" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict"> <c:forEach items="${fns:getDictList('APP_BUSINESS_TYPE')}" var="dict">
<option value="${dict.itemCode}" <option value="${dict.itemCode}"

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

@@ -158,7 +158,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<form:select path="cfgType" class="selectpicker select2 input-middle" > <form:select path="cfgType" class="selectpicker select2 input-middle" >
<form:option value=""><spring:message code='cfg_type'/></form:option> <%-- <form:option value=""><spring:message code='cfg_type'/></form:option> --%>
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict"> <c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}'/></form:option> <form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}'/></form:option>
</c:forEach> </c:forEach>
@@ -168,7 +168,16 @@
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<select id="seltype" class="selectpicker select2 input-middle" > <select id="seltype" class="selectpicker select2 input-middle" >
<option value="specServiceName"><spring:message code="protocol_name"/></option> <c:if test="${specificServiceCfg.cfgType==1}">
<option value="specServiceName"><spring:message code="app_name"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==3}">
<option value="specServiceName"><spring:message code="protocol_name"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==2}">
<option value="specServiceName"><spring:message code="tunnel_name"/>
</c:if>
</option>
</select> </select>
</div> </div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_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">
@@ -270,9 +279,39 @@
<th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th> <th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
<!-- <th>序号</th> --> <!-- <th>序号</th> -->
<th><spring:message code="business_type"/></th> <th><spring:message code="business_type"/></th>
<th><spring:message code="protocol_code"/></th> <th>
<th><spring:message code="protocol_name"/></th> <c:if test="${specificServiceCfg.cfgType==1}">
<th><spring:message code="protocol_desc"/></th> <spring:message code="app_code"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==2}">
<spring:message code="tunnel_code"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==3}">
<spring:message code="protocol_code"/>
</c:if>
</th>
<th>
<c:if test="${specificServiceCfg.cfgType==1}">
<spring:message code="app_name"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==2}">
<spring:message code="tunnel_name"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==3}">
<spring:message code="protocol_name"/>
</c:if>
</th>
<th>
<c:if test="${specificServiceCfg.cfgType==1}">
<spring:message code="app_desc"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==2}">
<spring:message code="tunnel_desc"/>
</c:if>
<c:if test="${specificServiceCfg.cfgType==3}">
<spring:message code="protoco_desc"/>
</c:if>
</th>
<%-- <th><spring:message code="group_id"/></th> --%> <%-- <th><spring:message code="group_id"/></th> --%>
<th><spring:message code="is_leaf"/></th> <th><spring:message code="is_leaf"/></th>
<th><spring:message code="cfg_type"/></th> <th><spring:message code="cfg_type"/></th>