diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js index ad8dd709..58d19483 100644 --- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js +++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js @@ -57,7 +57,7 @@ export function JurisdictionControl(num1, num2) { } }) } -// 所有工序 +// 所有工序(原) export function getTable2(stepNumber) { return request({ url: '', @@ -69,6 +69,18 @@ export function getTable2(stepNumber) { } }) } +// 所有工序(新) +export function getTable3(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工进度修改2_查询', + param: '工艺计划流水号=' + stepNumber + } + }) +} // 正在加工零件 export function searchParts(stepNumber) { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index 39e0294c..4646e1be 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 9848e49e..100e46d9 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -320,7 +320,7 @@