Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

This commit is contained in:
tanghao
2018-12-22 21:16:05 +08:00
4 changed files with 11 additions and 3 deletions

View File

@@ -1407,4 +1407,5 @@ ip=IP
country=Country country=Country
desc=Desc desc=Desc
unique_num=Unique unique_num=Unique
import_limit_is=The maximum import size is import_limit_is=The maximum import size is
upload_limit_is=The limitation of file uplaod is

View File

@@ -1411,4 +1411,5 @@ ip=IP
country=Country country=Country
desc=Desc desc=Desc
unique_num=Unique unique_num=Unique
import_limit_is=The maximum import size is import_limit_is=The maximum import size is
upload_limit_is=The limitation of file uplaod is

View File

@@ -1407,4 +1407,5 @@ ip=IP
country=Country country=Country
desc=Desc desc=Desc
unique_num=Unique unique_num=Unique
import_limit_is=\u5BFC\u5165\u9650\u5236\u6700\u5927\u6761\u6570 import_limit_is=\u5BFC\u5165\u9650\u5236\u6700\u5927\u6761\u6570
upload_limit_is=\u6587\u4EF6\u4E0A\u4F20\u4E2A\u6570\u9650\u5236

View File

@@ -99,6 +99,11 @@ $(function(){
if(sfd==632||sfd==631){ if(sfd==632||sfd==631){
var files = $(this)[0].files; var files = $(this)[0].files;
if(files.length>0){ if(files.length>0){
//多文件上传个数限制防止get请求url过长
if(files.length>50){
top.$.jBox.tip("<spring:message code='upload_limit_is'/>"+' '+50);
return false;
}
for(var i = 0;i < files.length;i ++) { for(var i = 0;i < files.length;i ++) {
var file = files[i]; var file = files[i];
var faceName = file.name; var faceName = file.name;