1、数据范围根据用户角色筛选;2、界面功能按钮根据权限是否显示;3、文件上传后,文件访问链接改为服务接口返回的参数内容

This commit is contained in:
zhangwei
2018-05-21 17:21:21 +08:00
parent 46f43c6f5d
commit b46e302824
5 changed files with 93 additions and 26 deletions

View File

@@ -52,10 +52,12 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/ntc/av/sample/fileSampleForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<shiro:hasPermission name="avFileSample:config">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/ntc/av/sample/fileSampleForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
</shiro:hasPermission>
</div>
<h3 class="page-title">
@@ -293,7 +295,7 @@
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>
<a href="${cfg.srcUrl }" data-original-title="${cfg.srcUrl }"
<a href="${cfg.srcUrl }" data-original-title="${cfg.srcUrl }" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.srcUrl,0,20) }
</a>
@@ -307,12 +309,11 @@
<td>${cfg.level }</td>
<td>${cfg.cfgDesc }</td>
<td>
<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemValue eq cfg.action }">
<spring:message code="${dict.itemCode }"/>
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>

View File

@@ -54,10 +54,13 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
<shiro:hasPermission name="avSignSample:config">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/ntc/av/sample/signSampleForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
</shiro:hasPermission>
</div>
<h3 class="page-title">
@@ -87,7 +90,7 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
<%-- <form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option> --%>
</form:select>
</div>
@@ -303,12 +306,11 @@
<td>${cfg.level }</td>
<td>${cfg.cfgDesc }</td>
<td>
<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemValue eq cfg.action }">
<spring:message code="${dict.itemCode }"/>
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>