diff --git a/src/api/Assembly/MakeAssemblyPlan.js b/src/api/Assembly/MakeAssemblyPlan.js index 853a0e20..e4f4e939 100644 --- a/src/api/Assembly/MakeAssemblyPlan.js +++ b/src/api/Assembly/MakeAssemblyPlan.js @@ -33,3 +33,71 @@ export function searchgroupName(num) { } }) } +export function getFileData(MachineDrawValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床总图_查询数据', + param: `机床流水号=${MachineDrawValue}` + } + }) +} +// 机床查询 +export function searchTable1(machineNumberValue, check2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_机床信息_查询数据', + param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + } + }) +} +// 组件查询 +export function searchTable2(machineNumberValue, type) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_工作计划_查询数据', + param: '机床流水号=' + machineNumberValue + '&计划类型=' + type + } + }) +} +export function deletedata(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_工作计划_删除数据', + param: '计划流水号=' + num + } + }) +} +export function editData(num, group, groupName, Name, time) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_工作计划_编辑数据', + param: '计划流水号=' + num + '&组件流水号=' + group + '&组号=' + groupName + '&任务名称=' + Name + '&计划工时=' + time + } + }) +} +export function addData(num, type) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_工作计划_增加数据', + param: '机床流水号=' + num + '&计划类型=' + type + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 8eaacaf2..aed58825 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +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 MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue index 8e4de56f..78643f0a 100644 --- a/src/views/Assembly/MakeAssemblyPlan/index.vue +++ b/src/views/Assembly/MakeAssemblyPlan/index.vue @@ -3,7 +3,7 @@ 机床编号: - + +

机床信息

- + + diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue new file mode 100644 index 00000000..aa49e19a --- /dev/null +++ b/src/views/Assembly/MakeElectricalAssembly/index.vue @@ -0,0 +1,244 @@ + + + + + diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue new file mode 100644 index 00000000..91160118 --- /dev/null +++ b/src/views/Assembly/MakePaintPlan/index.vue @@ -0,0 +1,244 @@ + + + + +