a

2019-09-25 20:16:57 +08:00
parent f92d58304c e3035b1d55
commit dd7f50e240
66 changed files with 454 additions and 393 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,8 +23,11 @@ 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
  timeout: 1500000 // 请求超时时间
 })
-
 export default service