|
@@ -51,7 +51,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-row style="text-align: right;">
|
|
|
- <el-button size="small" type="primary" @click="close">确认</el-button>
|
|
|
+ <el-button class="mt-40" size="small" type="primary" @click="close">确认</el-button>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
|
|
@@ -163,19 +163,15 @@ export default {
|
|
|
|
|
|
client(_that.dataObj)
|
|
|
.multipartUpload(`tmp/${fileName}`, file.file, {
|
|
|
- progress: function(p) {
|
|
|
+ progress: function(p) { // p进度条的值
|
|
|
// todo 每个文件一个进度条???如何限定的业务参数(幼儿园id、活动id)
|
|
|
- // p进度条的值
|
|
|
console.log(p);
|
|
|
_that.showProgress = true;
|
|
|
_that.progress = Math.floor(p * 100);
|
|
|
}
|
|
|
})
|
|
|
- .then(result => {
|
|
|
- //上传成功返回值,可针对项目需求写其他逻辑
|
|
|
- // todo 这里每完成一个文件,会回调一次。这里请求服务端保存业务。照片信息 + 幼儿园 + 活动...
|
|
|
- console.log(result);
|
|
|
- _that.saveData(result);
|
|
|
+ .then(result => { // 上传成功返回值,可针对项目需求写其他逻辑
|
|
|
+ _that.saveData(result, file.file.name, file.file.size);
|
|
|
})
|
|
|
.catch(err => {
|
|
|
console.log('err:', err);
|
|
@@ -185,15 +181,13 @@ export default {
|
|
|
multipartUpload();
|
|
|
})
|
|
|
},
|
|
|
- async saveData(obj) {
|
|
|
- console.log(obj);
|
|
|
+ async saveData(obj, name, size) {
|
|
|
const params = {
|
|
|
kindergartenId: this.form.kindergartenId,
|
|
|
activityId: this.form.activityId,
|
|
|
fileRequest: {
|
|
|
- // todo 补充字段
|
|
|
- originalFilename: 'abc',
|
|
|
- size: 100,
|
|
|
+ originalFilename: name,
|
|
|
+ size: size,
|
|
|
path: obj.name
|
|
|
}
|
|
|
};
|