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

加工进度查询

Browse Source
This commit is contained in:
zhangdingyu
2019-09-25 20:23:00 +08:00
parent dd7f50e240
commit 4d2aaed40a
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
=======
baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
>>>>>>> e3035b1d55444222c4f068bc3cd159ea6cd21458
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

19
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -451,13 +451,18 @@ export default {
value2: response.data[i].项目名称 value2: response.data[i].项目名称
}) })
} }
}).then(() => { if (Cookie.get('group') !== undefined) {
this.Machine = parseInt(Cookie.get('machineValue')) this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup() this.getGroup()
this.Group = parseInt(Cookie.get('group')) this.Group = parseInt(Cookie.get('group'))
this.getTableData() this.getTableData()
Cookie.remove('machineValue') Cookie.remove('machineValue')
Cookie.remove('group') Cookie.remove('group')
} else {
this.getTableData()
Cookie.remove('machineValue')
Cookie.remove('group')
}
}) })
} else { } else {
this.Machine = '' this.Machine = ''