gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/webapp/WEB-INF/include/excel/importModal.jsp
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
增加region和service导入属性，动态控制导入业务
优化导入界面
This commit is contained in:
duandongmei
2018-10-19 17:19:52 +08:00
parent 3b6a3b8721 02b7908116
commit 04833e917c
23 changed files with 250 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/include/header.jsp
View File

@@ -92,8 +92,6 @@
<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>