1、修复xmpp删除之后跳转404

2、隐藏白名单查询页面中多余字段do_log、区域管控范围、来函、分类、性质、标签
This commit is contained in:
leijun
2018-08-31 14:31:38 +08:00
parent 1b39b185ab
commit 21c279fa3d
3 changed files with 13 additions and 13 deletions

View File

@@ -155,7 +155,7 @@
<div class="pull-right"> <div class="pull-right">
<shiro:hasPermission name="other:xmpp:config"> <shiro:hasPermission name="other:xmpp:config">
<sys:delRow url="${ctx}/ntc/other/xmppForm" id="contentTable" label="update"></sys:delRow> <sys:delRow url="${ctx}/ntc/other/xmppForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/other/updatexmppCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> <sys:delRow url="${ctx}/ntc/other/updateXmppCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="other:xmpp:confirm"> <shiro:hasPermission name="other:xmpp:confirm">
<div class="btn-group"> <div class="btn-group">

View File

@@ -178,7 +178,7 @@
<!-- 筛选搜索内容栏默认隐藏--> <!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" > <div class="col-md-12 filter-action-select-panle hide" >
<div class="row"> <%-- <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@@ -238,7 +238,7 @@
</div> </div>
</div> </div> --%>
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
@@ -309,12 +309,12 @@
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></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="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th> <th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> <th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th> <th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%> <%-- <th><spring:message code="log_total"/></th> --%>
@@ -342,7 +342,7 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }"> <c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
@@ -415,7 +415,7 @@
class="tooltips" data-flag="false" data-html="true" data-placement="top"> class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(lableInfo,20)} ${fns:abbr(lableInfo,20)}
</a> </a>
</td> </td> --%>
<td> <td>
<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if> <c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if> <c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>

View File

@@ -178,7 +178,7 @@
<!-- 筛选搜索内容栏默认隐藏--> <!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" > <div class="col-md-12 filter-action-select-panle hide" >
<div class="row"> <%-- <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@@ -238,7 +238,7 @@
</div> </div>
</div> </div> --%>
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
@@ -309,12 +309,12 @@
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></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="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th> <th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> <th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th> <th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%> <%-- <th><spring:message code="log_total"/></th> --%>
@@ -342,7 +342,7 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict"> <c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }"> <c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
@@ -415,7 +415,7 @@
class="tooltips" data-flag="false" data-html="true" data-placement="top"> class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(lableInfo,20)} ${fns:abbr(lableInfo,20)}
</a> </a>
</td> </td> --%>
<td> <td>
<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if> <c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if> <c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>