diff --git a/.env.dev b/.env.dev index a56a202f..17275d74 100644 --- a/.env.dev +++ b/.env.dev @@ -13,7 +13,7 @@ VUE_APP_TITLE = 智能监控分析系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.8.22:48080' -VUE_APP_BASE_API = 'http://172.16.32.40:48080' +VUE_APP_BASE_API = 'http://172.16.32.79:48082' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/dist.zip b/dist.zip new file mode 100644 index 00000000..eea18efc Binary files /dev/null and b/dist.zip differ diff --git a/src/api/core/monitoring/auto.js b/src/api/core/monitoring/auto.js index d381ef83..2be59b88 100644 --- a/src/api/core/monitoring/auto.js +++ b/src/api/core/monitoring/auto.js @@ -44,16 +44,25 @@ export function getProductAuto(data) { // 班组自动报表分页 export function getTeamReportPage(data) { return request({ - url: '/monitoring/team-auto-report/page', - method: 'post', - data: data - }) + url: '/monitoring/group-off-record/page', + method: 'post', + data: data, + }); } // 班组自动报表分页详细 export function getTeamReportPageDet(id) { return request({ - url: '/monitoring/team-auto-report/pageDet?id=' + id, + url: '/monitoring/group-off-record/get?id=' + id, method: 'get', }) } + +export function exportGroupProductReportExcel(data) { + return request({ + url: '/monitoring/group-off-record/export-det-excel', + method: 'get', + params: data, + responseType: 'blob', + }); +} diff --git a/src/api/material/issue.js b/src/api/material/issue.js new file mode 100644 index 00000000..89d23408 --- /dev/null +++ b/src/api/material/issue.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' +// 获得工厂分页 +export function getMaterialReceiptIssuePageData(data) { + return request({ + url: '/base/material-warehouse-his/page', + method: 'post', + data: data, + }); +} + + +export function createMaterialIssue(data) { + return request({ + url: '/base/material-warehouse-his/create', + method: 'post', + data: data, + }); +} diff --git a/src/api/order/index.js b/src/api/order/index.js new file mode 100644 index 00000000..f9ec8a2c --- /dev/null +++ b/src/api/order/index.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +export function getOrderPage(data) { + return request({ + url: '/base/core-work-order/page', + method: 'post', + data: data, + }); +} + +export function updateOrderData(data) { + return request({ + url: '/base/core-work-order/updatee', + method: 'put', + data: data, + }); +} + +export function createOrderData(data) { + return request({ + url: '/base/core-work-order/create', + method: 'post', + data: data, + }); +} +export function getOrderData(id) { + return request({ + url: '/base/core-work-order/get?id=' + id, + method: 'get', + }); +} +export function getOrderCode(data) { + return request({ + url: '/base/core-work-order/getCode', + method: 'get', + data: data, + }); +} + +export function deleteOrder(id) { + return request({ + url: '/base/core-work-order/delete?id=' + id, + method: 'delete' + }) +} diff --git a/src/components/ButtonNav/index.vue b/src/components/ButtonNav/index.vue index c3bc57aa..4ea09e03 100644 --- a/src/components/ButtonNav/index.vue +++ b/src/components/ButtonNav/index.vue @@ -1,30 +1,16 @@ - -