|
@@ -715,10 +715,6 @@ export default {
|
|
|
|
|
|
beforeUpload(file) {
|
|
|
// ${this.form.project}
|
|
|
-<<<<<<< HEAD
|
|
|
- this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=${this.form.project}`
|
|
|
- // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=772`
|
|
|
-=======
|
|
|
// this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadAttachment?projectId=${this.form.project}`
|
|
|
// this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadAttachment?projectId=${this.form.project}`
|
|
|
if (process.env.NODE_ENV == 'development') {
|
|
@@ -729,7 +725,6 @@ export default {
|
|
|
else if (process.env.NODE_ENV == 'production') {
|
|
|
this.uploadAction= `${this.axios.defaults.baseURL}/platform/file/uploadAttachment?projectId=${this.form.project}`
|
|
|
}
|
|
|
->>>>>>> test-2
|
|
|
this.loadDisabled = true
|
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|
|
|
const fileName = file.name
|