加工进度查询

2019-09-25 20:23:00 +08:00
parent dd7f50e240
commit 4d2aaed40a
2 changed files with 13 additions and 12 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,11 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
-  baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
-=======
-  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
->>>>>>> e3035b1d55444222c4f068bc3cd159ea6cd21458
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
  timeout: 1500000 // 请求超时时间
 })
 export default service