|
@@ -1497,10 +1497,6 @@ export default {
|
|
|
|
|
|
|
|
|
beforeUpload(file) {
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
- this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
|
|
|
-=======
|
|
|
if (process.env.NODE_ENV == 'development') {
|
|
|
this.uploadAction= `/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
|
|
|
}
|
|
@@ -1510,7 +1506,6 @@ export default {
|
|
|
this.uploadAction= `${this.axios.defaults.baseURL}/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
|
|
|
}
|
|
|
// this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
|
|
|
->>>>>>> test-2
|
|
|
// this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
|
|
|
// this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.materialId}&projectId=${this.currentMaterial.projectId}`
|
|
|
this.loadDisabled = true
|