meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
zhangdingyu
2019-09-24 08:25:49 +08:00
parent 2a90014ac1
commit e067c1884c
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/request.js
View File

@@ -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 MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
<<<<<<< HEAD
baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
=======
baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
>>>>>>> f8c7e9afc36e00f5106add1477d9f258dbe37ec6
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

2
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -464,7 +464,7 @@ export default {
if (this.count1 !== 1) { if (this.count1 !== 1) {
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
} }
this.title1 = '新增'+this.personnelNumber+'修补工时' this.title1 = '新增' + this.personnelNumber + '修补工时'
this.dialogFormVisible = true this.dialogFormVisible = true
} }
}, },