From 94da2cf2246585734a52a8cf4334bbb9d7fcda93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Sun, 27 Sep 2026 11:42:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 10 +++++----- .../haianWarehouse/dashboard/autoJ1SortingBoard54.vue | 4 ++-- .../haianWarehouse/dashboard/autoJ2SortingBoard54.vue | 4 ++-- .../haianWarehouse/dashboard/sortingBoard54.vue | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 631d9d8..81874a2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -21,13 +21,13 @@ const _import = require('./import-' + process.env.NODE_ENV) const globalRoutes = [ { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } }, { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }, - // 海安人工四屏共用页面，自动J1H/J2H各自独立页面，固定分拣位防串屏；工厂由页面初始化并显式传给后端 - rqrq + // 海安六屏保留原URL，人工传工作位ST-MP-05至08，自动页固定ST-RP-03/04；请求、响应校验和订阅均按工作位防串屏 - rqrq { path: '/dashboard-haian-sorting-j1h', component: _import('modules/haianWarehouse/dashboard/autoJ1SortingBoard54'), name: 'haian-sorting-j1h', meta: { title: '海安自动分拣1' } }, { path: '/dashboard-haian-sorting-j2h', component: _import('modules/haianWarehouse/dashboard/autoJ2SortingBoard54'), name: 'haian-sorting-j2h', meta: { title: '海安自动分拣2' } }, - { path: '/dashboard-haian-sorting-r1h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r1h', props: { sortingStation: 'R1H', boardTitle: '人工分拣 1' }, meta: { title: '海安人工分拣1' } }, - { path: '/dashboard-haian-sorting-r2h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r2h', props: { sortingStation: 'R2H', boardTitle: '人工分拣 2' }, meta: { title: '海安人工分拣2' } }, - { path: '/dashboard-haian-sorting-r3h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r3h', props: { sortingStation: 'R3H', boardTitle: '人工分拣 3' }, meta: { title: '海安人工分拣3' } }, - { path: '/dashboard-haian-sorting-r4h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r4h', props: { sortingStation: 'R4H', boardTitle: '人工分拣 4' }, meta: { title: '海安人工分拣4' } }, + { path: '/dashboard-haian-sorting-r1h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r1h', props: { sortingStation: 'ST-MP-05', boardTitle: '人工分拣 1' }, meta: { title: '海安人工分拣1' } }, + { path: '/dashboard-haian-sorting-r2h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r2h', props: { sortingStation: 'ST-MP-06', boardTitle: '人工分拣 2' }, meta: { title: '海安人工分拣2' } }, + { path: '/dashboard-haian-sorting-r3h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r3h', props: { sortingStation: 'ST-MP-07', boardTitle: '人工分拣 3' }, meta: { title: '海安人工分拣3' } }, + { path: '/dashboard-haian-sorting-r4h', component: _import('modules/haianWarehouse/dashboard/sortingBoard54'), name: 'haian-sorting-r4h', props: { sortingStation: 'ST-MP-08', boardTitle: '人工分拣 4' }, meta: { title: '海安人工分拣4' } }, { path: '/dashboard-picking-board', component: _import('modules/dashboard/picking-board-1043'), name: 'dashboard-picking-board', meta: { title: '人工拣选看板' } }, { path: '/dashboard-picking2-board', component: _import('modules/dashboard/picking-board-1028'), name: 'dashboard-picking-board', meta: { title: '人工拣选看板' } }, { path: '/dashboard-robot-picking-board', component: _import('modules/dashboard/robot-picking-container'), name: 'dashboard-robot-picking-container', meta: { title: '机械臂拣选-周转箱' } }, diff --git a/src/views/modules/haianWarehouse/dashboard/autoJ1SortingBoard54.vue b/src/views/modules/haianWarehouse/dashboard/autoJ1SortingBoard54.vue index ea5900f..1236df2 100644 --- a/src/views/modules/haianWarehouse/dashboard/autoJ1SortingBoard54.vue +++ b/src/views/modules/haianWarehouse/dashboard/autoJ1SortingBoard54.vue @@ -77,8 +77,8 @@ export default { name: 'HaianAutoJ1SortingBoard54', data () { return { - // 本页面固定J1H，不接收其他位置参数，防止自动看板串屏 - rqrq - sortingStation: 'J1H', + // 本屏固定实际工作位ST-RP-03，查询、响应校验和订阅共用该身份；后端映射对应被分拣位ST-RP-01 - rqrq + sortingStation: 'ST-RP-03', boardTitle: '自动分拣 1', site: '', siteReady: false, diff --git a/src/views/modules/haianWarehouse/dashboard/autoJ2SortingBoard54.vue b/src/views/modules/haianWarehouse/dashboard/autoJ2SortingBoard54.vue index 85e2b9d..741423a 100644 --- a/src/views/modules/haianWarehouse/dashboard/autoJ2SortingBoard54.vue +++ b/src/views/modules/haianWarehouse/dashboard/autoJ2SortingBoard54.vue @@ -77,8 +77,8 @@ export default { name: 'HaianAutoJ2SortingBoard54', data () { return { - // 本页面固定J2H，不接收其他位置参数，防止自动看板串屏 - rqrq - sortingStation: 'J2H', + // 本屏固定实际工作位ST-RP-04，查询、响应校验和订阅共用该身份；后端映射对应被分拣位ST-RP-02 - rqrq + sortingStation: 'ST-RP-04', boardTitle: '自动分拣 2', site: '', siteReady: false, diff --git a/src/views/modules/haianWarehouse/dashboard/sortingBoard54.vue b/src/views/modules/haianWarehouse/dashboard/sortingBoard54.vue index cd89c6c..25eb389 100644 --- a/src/views/modules/haianWarehouse/dashboard/sortingBoard54.vue +++ b/src/views/modules/haianWarehouse/dashboard/sortingBoard54.vue @@ -71,7 +71,7 @@ import HaianBoardSocket from '@/utils/haianBoardSocket' import { getSortingBoardConfig } from '@/api/haianWarehouse/sortingBoardConfig' import { getManualSortingBoard } from '@/api/haianWarehouse/manualSortingBoard' -// 人工R1H-R4H共用本页面，props由四个固定路由传入；不依赖老看板和老业务流程 - rqrq +// 人工四屏共用本页面，props传实际工作位ST-MP-05至08；后端将WCS源盘清单映射到工作位 - rqrq export default { name: 'HaianSortingBoard54', props: { @@ -149,9 +149,9 @@ export default { this.lastReceivedAt = 0 this.siteReady = false this.site = '54' - // 人工共用页仅接收R1H-R4H，错误路由不得请求自动分拣数据 - rqrq - if (!['R1H', 'R2H', 'R3H', 'R4H'].includes(this.sortingStation)) { - this.message = '人工看板仅支持 R1H–R4H 分拣位' + // 人工页仅接收四个实际工作位，HTTP响应及WebSocket主题共用该身份；错误路由不得请求别屏数据 - rqrq + if (!['ST-MP-05', 'ST-MP-06', 'ST-MP-07', 'ST-MP-08'].includes(this.sortingStation)) { + this.message = '人工看板仅支持 ST-MP-05 至 ST-MP-08 分拣位' return } const querySite = this.$route.query.site