From f92ae74788ade4869290c1f0d442dfe63752aa26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Sat, 22 Feb 2025 14:30:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E5=AE=89=E7=81=AF=E6=8A=A5=E8=AD=A6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/andon/index.js | 65 ++++++++ api/workorder/index.js | 4 +- config.js | 2 +- manifest.json | 4 +- pages.json | 23 ++- pages/index.vue | 12 +- pages/produceManagement/andon/alarm.vue | 155 ++++++++++++++++++ pages/produceManagement/andon/record.vue | 191 ++++++++++++++++++++++ pages/produceManagement/andon/respond.vue | 126 ++++++++++++++ pages/work/index.vue | 52 +++--- store/modules/user.js | 2 +- utils/request.js | 2 +- 12 files changed, 607 insertions(+), 31 deletions(-) create mode 100644 api/andon/index.js create mode 100644 pages/produceManagement/andon/alarm.vue create mode 100644 pages/produceManagement/andon/record.vue create mode 100644 pages/produceManagement/andon/respond.vue diff --git a/api/andon/index.js b/api/andon/index.js new file mode 100644 index 0000000..164d24b --- /dev/null +++ b/api/andon/index.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 获取全部工艺路线(线别) +export function getAllRoute(params) { + return request({ + url: '/mes/Mobile/ReportWork/get_all_route', + method: 'get', + params + }) +} + +/** + * 获取故障类型 + * @param {*} query + * @returns + */ +export function GetAndonAlarmTypeDict() { + return request({ + url: '/mes/andonManagement/dataAnalysis/getAndonAlarmTypeDict', + method: 'get' + }) +} +/** + * 呼叫请求 + */ +export function CallHandle(data) { + return request({ + url: '/mes/andonManagement/interaction/Call', + method: 'post', + data: data + }) +} + +/** + * 获取待响应的 记录 + */ +export function WaitingResponse() { + return request({ + url: '/mes/andonManagement/interaction/waitingResponse', + method: 'get' + }) +} + +/** + * 签到 + */ +export function SignIn(query) { + return request({ + url: '/mes/andonManagement/interaction/signin', + method: 'post', + data: query + }) +} + +/** + * 获取故障记录表分页查询 + * @param {查询条件} data + */ +export function listAndonFaultRecord(data) { + return request({ + url: '/mes/andonManagement/AndonFaultRecord/list', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/api/workorder/index.js b/api/workorder/index.js index 756ab32..0074583 100644 --- a/api/workorder/index.js +++ b/api/workorder/index.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -// 获取全部工艺路线 +// 获取全部工艺路线(线别) export function getAllRoute(params) { return request({ url: '/mes/Mobile/ReportWork/get_all_route', @@ -8,7 +8,7 @@ export function getAllRoute(params) { }) } -// 获取全部工艺路线 +// 获取全部组别 export function getAllGroup(params) { return request({ url: '/mes/Mobile/ReportWork/get_groups', diff --git a/config.js b/config.js index a80fcf0..c4937d7 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,7 @@ module.exports = { // 应用名称 name: "DOAN-PDA", // 应用版本 - version: "1.2.0", + version: "1.4.0", // 应用logo logo: "/static/logo.png", // 官方网站 diff --git a/manifest.json b/manifest.json index dc1e36b..68ac201 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "DOAN总装车间PDA", "appid" : "__UNI__EFA389B", "description" : "DOAN总装车间PDA", - "versionName" : "1.2.0", - "versionCode" : 120, + "versionName" : "1.4.0", + "versionCode" : 140, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/pages.json b/pages.json index c928f68..edf6e08 100644 --- a/pages.json +++ b/pages.json @@ -140,6 +140,27 @@ { "navigationBarTitleText" : "扫码报工" } + }, + { + "path" : "pages/produceManagement/andon/alarm", + "style" : + { + "navigationBarTitleText" : "安灯报警" + } + }, + { + "path" : "pages/produceManagement/andon/respond", + "style" : + { + "navigationBarTitleText" : "故障响应" + } + }, + { + "path" : "pages/produceManagement/andon/record", + "style" : + { + "navigationBarTitleText" : "响应记录" + } } ], "tabBar": { @@ -156,7 +177,7 @@ "pagePath": "pages/work/index", "iconPath": "static/images/tabbar/work.png", "selectedIconPath": "static/images/tabbar/work_.png", - "text": "工具箱" + "text": "管理" }, { "pagePath": "pages/mine/index", "iconPath": "static/images/tabbar/mine.png", diff --git a/pages/index.vue b/pages/index.vue index 8dbe915..8dcce93 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -64,7 +64,12 @@ export default { name: '产线报工', icon: 'folder-add-filled', url: '/pages/produceManagement/workorder/workorder' - } + }, + { + name: '安灯报警', + icon: 'notification-filled', + url: '/pages/produceManagement/andon/alarm' + }, ], // 物料模块 materialOptions: [ @@ -171,7 +176,10 @@ view { height: 300rpx; line-height: 300rpx; } - +.card-box{ + padding-bottom: 60px; + margin-bottom: 60px; +} @media screen and (min-width: 500px) { .uni-swiper-dot-box { width: 400px; diff --git a/pages/produceManagement/andon/alarm.vue b/pages/produceManagement/andon/alarm.vue new file mode 100644 index 0000000..769fec4 --- /dev/null +++ b/pages/produceManagement/andon/alarm.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/pages/produceManagement/andon/record.vue b/pages/produceManagement/andon/record.vue new file mode 100644 index 0000000..a37cb2a --- /dev/null +++ b/pages/produceManagement/andon/record.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/pages/produceManagement/andon/respond.vue b/pages/produceManagement/andon/respond.vue new file mode 100644 index 0000000..b08e04e --- /dev/null +++ b/pages/produceManagement/andon/respond.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/pages/work/index.vue b/pages/work/index.vue index 80022cb..4d0e77e 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -1,10 +1,10 @@