|
@@ -80,9 +80,16 @@
|
|
|
this.photoList.push(photos.files[i]);
|
|
this.photoList.push(photos.files[i]);
|
|
|
}
|
|
}
|
|
|
this.allNum = this.photoList.length;
|
|
this.allNum = this.photoList.length;
|
|
|
|
|
+ var _this = this;
|
|
|
if(this.allNum > this.photoQuantityLimit){
|
|
if(this.allNum > this.photoQuantityLimit){
|
|
|
- alert("单次上传文件数量不能大于"+this.photoQuantityLimit+",当前数量为"+this.allNum);
|
|
|
|
|
- photos.files = null;
|
|
|
|
|
|
|
+ this.$alert('单次上传文件数量不能大于'+this.photoQuantityLimit+',当前数量为'+this.allNum, '提示', {
|
|
|
|
|
+ showClose:false,
|
|
|
|
|
+ confirmButtonText:'确定',
|
|
|
|
|
+ callback: action => {
|
|
|
|
|
+ _this.init();
|
|
|
|
|
+ photos.files = null;
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
//初始化this.concurrency个到photoLine中，开始处理
|
|
//初始化this.concurrency个到photoLine中，开始处理
|
|
@@ -90,7 +97,7 @@
|
|
|
for(var i = 0;i<this.photoLine.length;i++){
|
|
for(var i = 0;i<this.photoLine.length;i++){
|
|
|
this.processStudentPhoto(this.photoLine[i]);
|
|
this.processStudentPhoto(this.photoLine[i]);
|
|
|
}
|
|
}
|
|
|
- var _this = this;
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 启动检查,看photoLine中是否有已完成的，如果有，从photoList中取出第一个将其替换
|
|
* 启动检查,看photoLine中是否有已完成的，如果有，从photoList中取出第一个将其替换
|
|
|
* 队列中一直保持this.concurrency个正在处理的照片
|
|
* 队列中一直保持this.concurrency个正在处理的照片
|
chenken