diff --git a/src/router/index.js b/src/router/index.js index 6c25209..81e00b5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -20,7 +20,7 @@ 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: '登录' } }, - { path: '/dashboard-picking-board', component: _import('modules/dashboard/picking-board'), name: 'dashboard-picking-board', meta: { title: '人工拣选看板' } }, + { 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-board'), name: 'dashboard-robot-picking-container', meta: { title: '机械臂拣选-周转箱' } }, { path: '/dashboard-robot-picking-material', component: _import('modules/dashboard/robot-picking-material'), name: 'dashboard-robot-picking-material', meta: { title: '机械臂拣选-原材' } }, diff --git a/src/views/modules/dashboard/picking-board-1028.vue b/src/views/modules/dashboard/picking-board-1028.vue index 83a7dbe..6dbaaf5 100644 --- a/src/views/modules/dashboard/picking-board-1028.vue +++ b/src/views/modules/dashboard/picking-board-1028.vue @@ -245,6 +245,15 @@ export default { if (message.data.station1028List) { this.station1028List = message.data.station1028List + // 排序:等待分拣 在最上面,完成 在最下面 + this.station1028List.sort((a, b) => { + if (a.status === '等待分拣' && b.status !== '等待分拣') return -1 + if (a.status !== '等待分拣' && b.status === '等待分拣') return 1 + if (a.status === '完成' && b.status !== '完成') return 1 + if (a.status !== '完成' && b.status === '完成') return -1 + return 0 + }) + // 更新工单信息(从第一条数据中提取) if (this.station1028List.length > 0) { this.materialName = this.station1028List[0].pickingMaterialName || '' @@ -252,8 +261,6 @@ export default { this.workOrderNo = this.station1028List[0].workOrderNo || '' this.workOrderTime = this.station1028List[0].workOrderTime || '' } - - console.log('[1028站看板] 数据更新成功:', this.station1028List.length, '条') } } } @@ -414,7 +421,7 @@ export default { .screen-content { position: relative; z-index: 1; - padding: 20px; + padding: 8px 15px; height: calc(100vh - 60px); overflow-y: auto; @@ -439,7 +446,7 @@ export default { /* ===== 拣选面板 ===== */ .picking-panel { width: 100%; - height: calc(100vh - 100px); + height: calc(100vh - 80px); background: rgba(70, 90, 120, 0.9); backdrop-filter: blur(10px); border: 1px solid rgba(23, 179, 163, 0.5); @@ -548,7 +555,7 @@ export default { } th { - padding: 10px 6px; + padding: 5px 6px; color: #fcfdfd; font-size: 16px; font-weight: bold; diff --git a/src/views/modules/dashboard/picking-board-1043.vue b/src/views/modules/dashboard/picking-board-1043.vue index 13805a7..69c49e5 100644 --- a/src/views/modules/dashboard/picking-board-1043.vue +++ b/src/views/modules/dashboard/picking-board-1043.vue @@ -245,6 +245,15 @@ export default { if (message.data.station1043List) { this.station1043List = message.data.station1043List + // 排序:等待分拣 在最上面,完成 在最下面 + this.station1043List.sort((a, b) => { + if (a.status === '等待分拣' && b.status !== '等待分拣') return -1 + if (a.status !== '等待分拣' && b.status === '等待分拣') return 1 + if (a.status === '完成' && b.status !== '完成') return 1 + if (a.status !== '完成' && b.status === '完成') return -1 + return 0 + }) + // 更新工单信息(从第一条数据中提取) if (this.station1043List.length > 0) { this.materialName = this.station1043List[0].pickingMaterialName || '' @@ -252,8 +261,6 @@ export default { this.workOrderNo = this.station1043List[0].workOrderNo || '' this.workOrderTime = this.station1043List[0].workOrderTime || '' } - - console.log('[1043站看板] 数据更新成功:', this.station1043List.length, '条') } } } @@ -414,7 +421,7 @@ export default { .screen-content { position: relative; z-index: 1; - padding: 20px; + padding: 8px 15px; height: calc(100vh - 60px); overflow-y: auto; @@ -439,7 +446,7 @@ export default { /* ===== 拣选面板 ===== */ .picking-panel { width: 100%; - height: calc(100vh - 100px); + height: calc(100vh - 80px); background: rgba(70, 90, 120, 0.9); backdrop-filter: blur(10px); border: 1px solid rgba(23, 179, 163, 0.5); @@ -548,7 +555,7 @@ export default { } th { - padding: 10px 6px; + padding: 5px 6px; color: #fcfdfd; font-size: 16px; font-weight: bold;