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:
zhangwei
2018-05-21 11:22:51 +08:00
parent 0abeb3a901
commit 5643a8243f
12 changed files with 733 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -46,15 +46,28 @@ $(function(){
$(".action").on("change",function(){
$("#serviceId").val($(this).attr("serviceId"));
});
$("#cfgFrom").validate({
$("#cfgFrom").validate({
submitHandler: function(form){
var srcFile = $("#srcFile").val();
var sampleFile = $("#sampleFile").val();
var srcUrl = $("#srcUrl").val();
var sampleUrl = $("#sampleUrl").val();
if((srcUrl==null||srcUrl=="") && (srcFile==null || srcFile=="")){
$("div[for='srcFile']").append("<label id='level-error' class='error' for='srcFile'><spring:message code='required'></spring:message></label>");
return false;
}else if((sampleUrl==null || sampleUrl=="") && (sampleFile==null || sampleFile=="")){
$("div[for='sampleFile']").append("<label id='level-error' class='error' for='sampleFile'><spring:message code='required'></spring:message></label>");
return false;
}else{
//loading('onloading...');
form.submit();
}
},
errorContainer: "#messageBox",
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
//loading('onloading...');
form.submit();
},
errorContainer: "#messageBox",
});
});
</script>
@@ -79,7 +92,7 @@ $(function(){
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="cfgFrom" action="${ctx}/ntc/av/sample/saveFileSample" method="post" class="form-horizontal">
<form id="cfgFrom" action="${ctx}/ntc/av/sample/saveFileSample" enctype="multipart/form-data" method="post" class="form-horizontal">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
@@ -101,32 +114,41 @@ $(function(){
</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="src_url"/></label>
<div class="col-md-6">
<input class="form-control required" type="text" name="srcUrl" value="${_cfg.srcUrl }">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="sample_url"/></label>
<div class="col-md-6">
<input class="form-control required" type="text" name="sampleUrl" value="${_cfg.sampleUrl}">
</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="harm_level"/></label>
<div class="col-md-6">
<input class="form-control required" type="text" name="level" value="${_cfg.level }">
</div>
<div for="level"></div>
</div>
</div>
</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="src_url"/></label>
<div class="col-md-6">
<%-- <input class="form-control required" type="text" name="srcUrl" value="${_cfg.srcUrl }"> --%>
<input id="srcFile" name="srcFile" type="file" style="width: 330px" />
<input id="srcUrl" name="srcUrl" type="hidden" value="${_cfg.srcUrl }"/>
</div>
<div for="srcFile"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="sample_url"/></label>
<div class="col-md-6">
<%-- <input class="form-control required" type="text" name="sampleUrl" value="${_cfg.sampleUrl}"> --%>
<input id="sampleFile" name="sampleFile" type="file"style="width: 330px" />
<input id="sampleUrl" name="sampleUrl" type="hidden" value="${_cfg.sampleUrl }" />
</div>
<div for="sampleFile"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
@@ -143,10 +165,12 @@ $(function(){
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
</div>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
<input type="hidden" name="isAreaEffective" value="0">
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>
<div class="form-actions">

31
src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
View File

@@ -8,7 +8,9 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
} else{
}else if("${cfg.level}"){
$("#intype").val("${cfg.level}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
$("#seltype").change(function(){
@@ -27,7 +29,7 @@
$(this).find("option:first").attr("selected",true);
});
$(".Wdate").attr("value",'');
$("#keywords").attr("value",'');
$("#level").attr("value",'');
$("#searchForm")[0].reset();
});
});
@@ -65,7 +67,7 @@
<div class="portlet">
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/fileSamplelist" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -94,6 +96,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="level"><spring:message code="harm_level"></spring:message></form:option>
</form:select>
</div>
@@ -110,7 +113,7 @@
<div class="pull-right">
<shiro:hasPermission name="avFileSample:config">
<sys:delRow url="${ctx}/ntc/av/sample/fileSampleForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/sample/saveFileSample?isValid=-1" id="contentTable" label="delete"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/sample/updateAvFileSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="avFileSample:audit">
<div class="btn-group">
@@ -119,9 +122,9 @@
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><sys:delRow url="${ctx}/ntc/av/sample/saveFileSample?isAudit=1&isValid=1" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/av/sample/saveFileSample?isAudit=2&isValid=0" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/av/sample/saveFileSample?isAudit=3&isValid=0" id="contentTable" label="cancelPass"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/av/sample/auditAvFileSample?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/av/sample/auditAvFileSample?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/av/sample/auditAvFileSample?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</shiro:hasPermission>
@@ -289,8 +292,18 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>${cfg.srcUrl }</td>
<td>${cfg.sampleUrl }</td>
<td>
<a href="${cfg.srcUrl }" data-original-title="${cfg.srcUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.srcUrl,0,20) }
</a>
</td>
<td>
<a href="${cfg.sampleUrl }" target="_blank" data-original-title="${cfg.sampleUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.sampleUrl,0,20) }
</a>
</td>
<td>${cfg.level }</td>
<td>${cfg.cfgDesc }</td>
<td>