voip界面去掉无用的检索条件

摘要文件类型增加音视频文件类
ip和http增加配置导出

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -0,0 +1,162 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%> 
+<script type="text/javascript">
+$(function(){
+	//console.log("调用须知：调用本页面函数在common.js里，并且需要配置字典MAAT_SERVICE中的项")
+});
+</script>
+<div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
+	<form id="importForm1" action="${ctx}/ntc/iplist/import" method="post" enctype="multipart/form-data" class="form-horizontal"
+		onsubmit="loading('<spring:message code='loading'/>');">
+		
+		<div class="modal-dialog" role="document" style="width:700px;">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title" id="exampleModalLabel">
+						<spring:message code="import" />
+					</h5>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+					<div class="alert alert-error hide">
+						<button class="close" data-dismiss="alert"></button>
+						<span></span>
+					</div>
+						<div class="form-group">
+							<label class="control-label col-md-3"> <spring:message
+									code="action" />
+							</label>
+							<div class="col-md-6">
+								<c:forEach items="${serviceList}" var="service"
+									varStatus="satus">
+									<label class="radio-inline">
+										<c:if test="${cfg.functionId eq service.functionId}">
+											<c:forEach items="${fns:getDictList('MAAT_SERVICE')}" var="serviceC">
+												<c:if test="${service.serviceId==serviceC.itemCode}">
+													<span class="${serviceC.itemValue}">
+														<input type="radio" name="serviceDictId" <c:if test="${serviceList.size() eq 1}">checked</c:if>
+															serviceId="${service.serviceId }" 
+															functionId="${service.functionId }"
+															cfgRegionCodeS="${service.regionCode }"
+															protocolId="${service.protocolId }"
+															action="${service.action }"
+															value="${service.dictId }" class="required action">
+														<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+															<c:if test="${dict.itemCode eq service.action}">
+																<spring:message code="${dict.itemValue }"/>
+															</c:if>
+														</c:forEach>
+													</span>
+												</c:if>
+		               						</c:forEach>
+										</c:if>
+									</label>
+								</c:forEach>
+							</div>
+							<div for="action"></div>
+						</div>
+						<div class="form-group">
+							<label class="control-label col-md-3"> <spring:message
+									code="cfg_type" />
+							</label>
+							<div class="col-md-6">
+								<c:forEach items="${regionList}" var="region"
+										varStatus="satus">
+									<label class="radio-inline">
+											<c:if test="${cfg.functionId eq region.functionId}">
+												<span>
+													<input type="radio" name="regionDictIds" class="required" 
+															value="${region.dictId }"
+															regionValue="${region.configRegionValue }"
+															regionType="${region.regionType }" 
+															isMaat="${region.isMaat }"
+															cfgRegionCodeR="${region.configRegionCode }"
+															configServiceType="${region.configServiceType }"
+															configMultiKeywords="${region.configMultiKeywords }"
+															configHex="${region.configHex }"
+															configIpPortShow="${region.configIpPortShow}"
+												   			configIpType="${region.configIpType}"
+												   			configIpPattern="${region.configIpPattern}"
+												   			configPortPattern="${region.configPortPattern}"
+												   			configDirection="${region.configDirection}"
+												   			configProtocol="${region.configProtocol}"
+												   			<c:if test="${regionList.size() eq 1}">checked</c:if>
+														>
+															<spring:message code="${region.configRegionValue }"/>
+												</span>
+											</c:if>
+									</label>
+								</c:forEach>
+							</div>
+							<div for="action"></div>
+						</div>
+						<div class="row">
+					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
+					           <div class="col-md-6">
+					               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+					               		<option value=""><spring:message code="select"/></option>
+					               	<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
+					               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
+					               			<option value="${requestInfo.id}" 
+					               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
+					               		</c:if>
+					               	</c:forEach>
+					               </select>
+					           </div>
+					           <div for="requestId"></div>
+						</div>
+						</br>
+						<div class="col-md-12">
+							<div class="form-group">
+								<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message
+										code="chooseFile" />：</label>
+								<div class="controls">
+
+									<div class="fileupload fileupload-new"
+										data-provides="fileupload">
+
+										<div class="input-append">
+
+											<div class="uneditable-input">
+												<i class="fa fa-fa fa-file"></i> <span
+													class="fileupload-preview"></span>
+											</div>
+											<span class="btn btn-file ">
+												<button type="button" class="btn fileupload-new">
+													<spring:message code="add" />
+												</button>
+												<button type="button" class="btn fileupload-exists">
+													<spring:message code="edit" />
+												</button> <input type="file" class="default" id="uploadFile"
+												name="files" /> <input type="hidden" name="flag"
+												value="${flag }" />
+											</span>
+											<button type="button" class="btn red fileupload-exists"
+												data-dismiss="fileupload" style="margin-left:-1px;">
+												<spring:message code="remove" />
+												</a>
+												<button type="button" onclick="downLoadTemplate('${ctx}')"
+													class="btn black" style="margin-left:-1px">
+													<spring:message code="download" />
+												</button>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn red" onclick="importCfg()">
+						<spring:message code="ok" />
+					</button>
+					<button type="button" class="btn" data-dismiss="modal">
+						<spring:message code="close" />
+					</button>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>

src/main/webapp/WEB-INF/include/header.jsp

@@ -92,6 +92,8 @@
 	<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js"></script>
 	</c:otherwise>
 </c:choose>
+<script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
+
 <script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>