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

地址池、策略配置列表修改.

Browse Source
This commit is contained in:
zhangwq
2018-12-03 19:24:37 +08:00
parent 50e87fb853
commit fdff7a222e
6 changed files with 50 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -379,6 +379,9 @@
<if test="ipTotal != null" >
ip_total = #{ipTotal,jdbcType=INTEGER},
</if>
<if test="addrPoolName != null and addrPoolName != ''" >
addr_pool_name = #{addrPoolName,jdbcType=VARCHAR},
</if>
<if test="isValid != null" >
is_valid = #{isValid,jdbcType=INTEGER},
</if>

3
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -252,6 +252,9 @@
<if test="userType != null and userType != ''" >
user_type = #{userType,jdbcType=VARCHAR},
</if>
<if test="cfgDesc != null and cfgDesc != ''" >
cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
</if>
<if test="addrPoolId != null" >
addr_pool_id = #{addrPoolId,jdbcType=INTEGER},
</if>

33
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
View File

@@ -84,7 +84,7 @@
success:function(data,status){
var dataArr = data.candidate_ip;
var html = ""
html = "<div style='width:98%;overflow: auto;margin-top: 10px;height: 300px;margin-left: 1%;margin-right: 1%;'><br>"
html = "<div style='width:98%; overflow: auto; height: 300px; margin-left: 1%; margin-right: 1%;'><br>"
html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
html+="<tbody>";
if(dataArr.length == 0){
@@ -179,20 +179,13 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgId"><spring:message code="address_pool_id"></spring:message></form:option>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
</div>
<input id="intype" class="form-control input-medium" type="text" value="">
<div class="input-group-btn">
<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${serviceList}" var="service">
<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
</c:forEach>
</form:select>
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
@@ -364,11 +357,11 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.compile_id"><spring:message code="address_pool_id"/></th>
<th><spring:message code="address_pool"/></th>
<th class="sort-column r.ipTotal"><spring:message code="ip_total"/></th>
<th class="sort-column r.available_ip_total"><spring:message code="available_ip_total"/></th>
<th class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
<th class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
<th><spring:message code="available_ip_total"/></th>
<th><spring:message code="block_type"/></th>
<%-- <th><spring:message code="block_type"/></th> --%>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
@@ -376,7 +369,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="operation"/></th>
<%-- <th><spring:message code="operation"/></th> --%>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
@@ -391,21 +384,21 @@
<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}" addressPoolId="${cfg.cfgId }" ></td>
<td>${cfg.cfgId }</td>
<td>
<a href="javascript:;" data-original-title="${cfg.addrPoolName}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"
data-original-title="${cfg.addrPoolName}" class="tooltips addrPool" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.addrPoolName,20)}
</a>
</td>
<td>${cfg.ipTotal }</td>
<td audit="${cfg.isAudit}" addrPoolId="${cfg.cfgId }"><div class="loading-total"></div></td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<td>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
@@ -485,11 +478,11 @@
${fns:abbr(lableInfo,20)}
</a>
</td>
<td>
<%-- <td>
<!-- <a href="#">新增IP</a>
<a href="#">删除IP</a> -->
<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"><spring:message code="show_detail"/></a>
</td>
</td> --%>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>

31
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
View File

@@ -87,7 +87,7 @@ $(function(){
<!-- dolog begin-->
<!-- <div class="row doLog"> -->
<div class="col-md-6">
<div class="form-group">
<div class="form-group hidden">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
@@ -108,6 +108,21 @@ $(function(){
<!-- </div> -->
<!-- dolog end-->
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
<div class="col-md-6">
<select name="userId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${users }" var="user">
<option value="${user.id}" <c:if test="${_cfg.userId eq user.id }">selected</c:if>><spring:message code="${user.userName}"/></option>
</c:forEach>
</select>
</div>
<div for="userId"></div>
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<div class="col-md-6">
<div class="form-group">
@@ -138,20 +153,6 @@ $(function(){
</c:if>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
<div class="col-md-6">
<select name="userId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${users }" var="user">
<option value="${user.id}" <c:if test="${_cfg.userId eq user.id }">selected</c:if>><spring:message code="${user.userName}"/></option>
</c:forEach>
</select>
</div>
<div for="userId"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="address_pool"/></label>

35
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
View File

@@ -100,7 +100,6 @@
<form:option value="userName"><spring:message code="user"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -108,13 +107,7 @@
<input id="intype" class="form-control input-medium" type="text" value="">
<div class="input-group-btn">
<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${serviceList}" var="service">
<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
</c:forEach>
</form:select>
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
@@ -131,7 +124,7 @@
<shiro:hasPermission name="snat_policy:config">
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatPolicyForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatDelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
<%-- <sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
</shiro:hasPermission>
<shiro:hasPermission name="snat_policy:confirm">
<div class="btn-group">
@@ -285,26 +278,26 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.cfg_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="address_pool"/></th>
<th><spring:message code="user"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<%-- <th class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="do_log"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
</tr>
</thead>
<tbody>
@@ -330,13 +323,13 @@
</c:forEach>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<td>
<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
@@ -350,13 +343,13 @@
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
</c:choose>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<%-- <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">

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

@@ -96,7 +96,7 @@ $(function(){
top.$.jBox(html,{height:450,width:600,title:"<i class='icon-book-open'></i> Log Info",showIcon:false,opacity:0.5});
});
//表格中的tooltips鼠标点击复制完整的内容
$("td>.tooltips").on("click",function(){
$("td>.tooltips").not(".addrPool").on("click",function(){
//$(this).attr("data-clipboard-action","copy");
$(this).attr("data-clipboard-text",$(this).attr("data-original-title"));
var clipboard = new ClipboardJS('td >.tooltips');