From 4cc4badd55cf0e6e113a60b257e6491e027828ef Mon Sep 17 00:00:00 2001 From: bryan sun Date: Fri, 27 Dec 2019 14:19:21 +0800 Subject: [PATCH 1/3] 1 --- src/utils/request.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..7b85968f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,16 +17,16 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 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 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.0.104:8079/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From 208753b1a45f187b9f4f2e89c5ad88c927a5c729 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Sun, 5 Jan 2020 10:56:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=90=A5=E9=94=80=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 7b85968f..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,16 +17,16 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 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 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` -export const MESDownloadFile = `http://192.168.0.104:8079/submit/MESDownloadFile.ashx` +export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From a25a3fa47301ac767d999af1944c9de9c881981c Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 5 Jan 2020 15:31:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleCompletionDetails.js | 12 +-- .../ScheduleCompletionDetails/index.vue | 91 +++++++------------ 2 files changed, 38 insertions(+), 65 deletions(-) diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js index c06d4713..e0d25e79 100644 --- a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js +++ b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js @@ -1,27 +1,27 @@ import request from '@/utils/request' // 查询人员总工工时 -export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) { +export function searchtable(num1, num2, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计_查询数据2_新', - param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + name: '车间生产管理工艺_工时统计_设备工时_Vue', + param: '开始时间=' + num1 + '&结束时间=' + num2, Pagination: pageCurrent + '&' + pageSize } }) } // 查询人员具体工序 -export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { +export function searchtable2(num1, num2, num3, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新', - param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, + name: '车间生产管理工艺_工时统计_设备工时_Vue_详细', + param: '人员编号=' + num1 + '&开始时间=' + num2 + '&结束时间=' + num3, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index aa2f6807..2e5f07e8 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -17,24 +17,11 @@ type="date" placeholder="选择加工完成日期"/> 查询 - - - - + - + - - - - - - - - - + - + - + + + + @@ -168,12 +160,7 @@ export default { this.tableData = [] this.tableData2 = [] this.total2 = 0 - if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) { - this.timeCheck = 1 - } else { - this.timeCheck = 0 - } - searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { + searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { if (response.data.total === 0) { this.loading = false } else { @@ -188,23 +175,9 @@ export default { this.loading2 = true this.tableData2 = [] this.pageCurrent2 = 1 - searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { + searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { if (response.data.rows.length !== 0) { - for (let i = 0; i < response.data.rows.length; i++) { - this.tableData2.push({ - 零件图号: response.data.rows[i].零件图号, - 零件名称: response.data.rows[i].零件名称, - 工艺名称: response.data.rows[i].工艺名称, - 完成数量: response.data.rows[i].完成数量, - 质检结果: response.data.rows[i].质检结果, - 设备工时: response.data.rows[i].设备工时, - 不合格数量: response.data.rows[i].不合格数量, - 理论加工时间段: response.data.rows[i].理论加工时间段, - 实际加工时间段: response.data.rows[i].实际加工时间段, - 加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '', - 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : '' - }) - } + this.tableData2 = response.data.rows } this.loading2 = false this.total2 = response.data.total