Commit d89d3de6 authored by qzhxx's avatar qzhxx

merge

parents 302be7b2 1de30077
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
this.filedata.append('file', file.file) this.filedata.append('file', file.file)
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 < 1; const isLt5M = file.size / 1024 / 1024 / 1024 < 1;
if (!isLt5M) { if (!isLt5M) {
this.$message.error("上传文件大小不能超过 1GB!"); this.$message.error("上传文件大小不能超过 1GB!");
} }
......
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
this.filedata.append("file", file.file); this.filedata.append("file", file.file);
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isLt10G = file.size / 1024 < 10; const isLt10G = file.size / 1024 / 1024 / 1024 < 10;
if (!isLt10G) { if (!isLt10G) {
this.$message.error("上传文件大小不能超过 10GB!"); this.$message.error("上传文件大小不能超过 10GB!");
} }
......
...@@ -52,7 +52,6 @@ export default { ...@@ -52,7 +52,6 @@ export default {
console.log(res) console.log(res)
if (resData.resultCode == "200") { if (resData.resultCode == "200") {
// alert("上传成功");
console.log(resData.data.fileList) console.log(resData.data.fileList)
const data = resData.data.fileList const data = resData.data.fileList
console.log(data) console.log(data)
...@@ -76,7 +75,7 @@ export default { ...@@ -76,7 +75,7 @@ export default {
this.filedata.append('file', file.file) this.filedata.append('file', file.file)
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isLt10G = file.size / 1024 < 10; const isLt10G = file.size / 1024 / 1024 / 1024 < 10;
if (!isLt10G) { if (!isLt10G) {
this.$message.error("上传文件大小不能超过 10GB!"); this.$message.error("上传文件大小不能超过 10GB!");
} }
...@@ -109,9 +108,7 @@ export default { ...@@ -109,9 +108,7 @@ export default {
) )
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.resultCode == 200) { if (resData.resultCode == 200) {
alert("上传成功");
// _this.getOrgTree(); // _this.getOrgTree();
} else { } else {
_this.$message.error(resData.msg || resData.message); _this.$message.error(resData.msg || resData.message);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment