diff --git a/api/product.js b/api/product.js index ea1d0da..942ece1 100644 --- a/api/product.js +++ b/api/product.js @@ -75,6 +75,67 @@ const saveAfterPlatIn = (data) => { }) } +// 绑定维护 根据流程卡号查询信息 +const bindingQuery = (params) => { + return http.request({ + url: '/blade-desk/workProcess/getCurrentWorkPlan', + method: 'GET', + params + }) +} +// 根据流程卡号查询 绑定信息 +const getMacToolUseByWpId = (params) => { + return http.request({ + url: '/blade-desk/workProcess/getMacToolUseByWpId', + method: 'GET', + params + }) +} +// 删除 绑定记录 +const bindingRemove = (params) => { + return http.request({ + url: '/blade-desk/workProcess/remove', + method: 'POST', + params + }) +} + +// 绑定记录查询 根据挂具查询绑定记录 +const getMacToolUseByToolId = (params) => { + return http.request({ + url: '/blade-desk/workProcess/getBindMacToolUseByRsCode', + method: 'GET', + params + }) +} + +// 绑定记录查询 根据飞靶查询绑定记录 +const getBindMacToolUseByFsCode = (params) => { + return http.request({ + url: '/blade-desk/workProcess/getBindMacToolUseByFsCode', + method: 'GET', + params + }) +} + +// 绑定记录查询 根据设备查询绑定记录 +const getBindMacToolUseByDeviceCode = (params) => { + return http.request({ + url: '/blade-desk/workProcess/getBindMacToolUseByDeviceCode', + method: 'GET', + params + }) +} + +// 绑定记录 新增 +const addMacToolUse = (data) => { + return http.request({ + url: '/blade-desk/workProcess/saveMacToolUse', + method: 'POST', + data: data + }) +} + export default { loadNotReceived, workPlanReceive, @@ -84,5 +145,12 @@ export default { dictionaryNew, saveProCheck, getAfterPlatInCardNo, - saveAfterPlatIn + saveAfterPlatIn, + bindingQuery, + getMacToolUseByWpId, + bindingRemove, + addMacToolUse, + getBindMacToolUseByDeviceCode, + getBindMacToolUseByFsCode, + getMacToolUseByToolId } \ No newline at end of file diff --git a/pages.json b/pages.json index 7d2367d..72918a4 100644 --- a/pages.json +++ b/pages.json @@ -284,6 +284,12 @@ "style": { "navigationBarTitleText": "站点管理" } + }, + { + "path": "pages/production/bindingMaintenance", + "style": { + "navigationBarTitleText": "绑定维护" + } } ], "globalStyle": { diff --git a/pages/index/menu.js b/pages/index/menu.js index 26beadc..7bcdfd8 100644 --- a/pages/index/menu.js +++ b/pages/index/menu.js @@ -217,6 +217,18 @@ const menus = { type: '' } }, + { + key: "bindingMaintenance", + title: "绑定维护", + url: "../production/bindingMaintenance", + bgColor: '', + limit: 'RB2314', + icon: { + size: 20, + color: '#31b26b', + type: '' + } + }, ], }, diff --git a/pages/login/login-account.vue b/pages/login/login-account.vue index ffc65c2..e269e9b 100644 --- a/pages/login/login-account.vue +++ b/pages/login/login-account.vue @@ -261,9 +261,9 @@ export default { } }) .catch((err) => { - console.log(err); + // console.log(err); this.loading = false; - // this.$u.func.showToast({ title: "用户名或密码错误" }); + this.$u.func.showToast({ title: "用户名或密码错误" }); }); } }, diff --git a/pages/production/bindingMaintenance.vue b/pages/production/bindingMaintenance.vue new file mode 100644 index 0000000..c773cb2 --- /dev/null +++ b/pages/production/bindingMaintenance.vue @@ -0,0 +1,582 @@ + + + + + \ No newline at end of file diff --git a/static/images/menus/bindingMaintenance.png b/static/images/menus/bindingMaintenance.png new file mode 100644 index 0000000..e1b9c5b Binary files /dev/null and b/static/images/menus/bindingMaintenance.png differ