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:
wangxin
2018-10-19 17:52:01 +08:00
parent 04833e917c
commit eefe3b35dd
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/taglib.jsp"%>
<script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
<div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true"> <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
<<<<<<< HEAD
<form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal" <form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
onsubmit="loading('<spring:message code='loading'/>');"> onsubmit="loading('<spring:message code='loading'/>');">

3
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -536,8 +536,7 @@
</div> </div>
</div> </div>
</div> </div>
<c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list"/> <c:set var="importPath" value="/proxy/intercept/${fn:toLowerCase(interceptType)}/list?functionId=${cfg.functionId}"/>
<c:set var="functionId" value="${cfg.functionId}"/>
<!-- 模板导入，start --> <!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %> <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body> </body>

1
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -471,7 +471,6 @@
</div> </div>
</div> </div>
</div> </div>
<<<<<<< HEAD
<c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/> <c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
<!-- 模板导入，start --> <!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %> <%@include file="/WEB-INF/include/excel/importModal.jsp" %>