a

src/utils/request.js

@@ -3,6 +3,7 @@ import axios from 'axios'
 export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
 export const name = `OP8888`
 export const name1 = `OP1000`
+export const name3 = `OP2000`
 
 // 创建axios实例
 export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
@@ -23,7 +24,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://localhost:8005/submit/MESCommonBase.ashx`,
+=======
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+>>>>>>> 86989987e2fefa8d0084dce8a0f3b020afa872e7
   timeout: 1500000 // 请求超时时间
 })
 export default service