From ba8dda5caa5da874f435262706bc3c83e11f9afa Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Oct 2019 14:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ActualWorkQuery.js | 14 ++ src/utils/request.js | 3 +- src/utils/tool.js | 10 +- .../ActualWorkQuery/index.vue | 174 ++++++++++++++++++ 4 files changed, 198 insertions(+), 3 deletions(-) create mode 100644 src/api/ManufacturingCenter/ActualWorkQuery.js create mode 100644 src/views/ManufacturingCenter/ActualWorkQuery/index.vue diff --git a/src/api/ManufacturingCenter/ActualWorkQuery.js b/src/api/ManufacturingCenter/ActualWorkQuery.js new file mode 100644 index 00000000..dd40a1b1 --- /dev/null +++ b/src/api/ManufacturingCenter/ActualWorkQuery.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' +// 查询加工工时统计表 +export function searchTable(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_当日过程工时查询', + param: `加工开始时间_check=${num1}&加工开始时间=${num2}&工作者姓名_check=${num3}&工作者姓名=${num4}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 596cc146..7218f9b2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,8 +26,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.0.110:8002/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/utils/tool.js b/src/utils/tool.js index d6bb50a1..08823c69 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -41,7 +41,7 @@ function zeroFill(i) { return i } } -// 获取当前时间 +// 获取当前时间(yyyy-mm-dd hh:mm:ss) export function getNowTime() { const date = new Date() const month = zeroFill(date.getMonth() + 1) @@ -52,6 +52,14 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } +// 获取当前时间(yyyy-mm-dd) +export function getNowShotTime() { + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const time = date.getFullYear() + '-' + month + '-' + day + return time +} // 判断类型 export function type(target) { const ret = typeof (target) diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue new file mode 100644 index 00000000..27a87767 --- /dev/null +++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue @@ -0,0 +1,174 @@ + + + + +