二级前端页面修改
This commit is contained in:
@@ -1148,7 +1148,7 @@ export default {
|
|||||||
// 刷新生产计划队列(独立方法,可被信号触发)
|
// 刷新生产计划队列(独立方法,可被信号触发)
|
||||||
async refreshPlanQueue() {
|
async refreshPlanQueue() {
|
||||||
try {
|
try {
|
||||||
// 由于后端默认只查NEW和READY,需要分别查询多个状态然后合并
|
// 只查询活动状态的计划,排除已完成和甩尾
|
||||||
const statuses = ['ONLINE', 'PRODUCING', 'READY', 'NEW']
|
const statuses = ['ONLINE', 'PRODUCING', 'READY', 'NEW']
|
||||||
const allPlans = []
|
const allPlans = []
|
||||||
|
|
||||||
@@ -1174,17 +1174,22 @@ export default {
|
|||||||
new Map(allPlans.map(plan => [plan.id, plan])).values()
|
new Map(allPlans.map(plan => [plan.id, plan])).values()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// 排除已完成和甩尾的计划
|
||||||
|
const excludeStatuses = ['PRODUCT', 'PAY_OVER', 'COMPLETED', 'CANCELLED', 'UNLOAD']
|
||||||
|
const activePlans = uniquePlans.filter(plan =>
|
||||||
|
!excludeStatuses.includes(plan.status)
|
||||||
|
)
|
||||||
|
|
||||||
// 定义状态优先级
|
// 定义状态优先级
|
||||||
const statusPriority = {
|
const statusPriority = {
|
||||||
'PRODUCING': 1,
|
'PRODUCING': 1,
|
||||||
'PRODUCTING': 1,
|
|
||||||
'ONLINE': 2,
|
'ONLINE': 2,
|
||||||
'READY': 3,
|
'READY': 3,
|
||||||
'NEW': 4
|
'NEW': 4
|
||||||
}
|
}
|
||||||
|
|
||||||
// 排序
|
// 排序
|
||||||
const sortedPlans = uniquePlans.sort((a, b) => {
|
const sortedPlans = activePlans.sort((a, b) => {
|
||||||
const priorityA = statusPriority[a.status] || 500
|
const priorityA = statusPriority[a.status] || 500
|
||||||
const priorityB = statusPriority[b.status] || 500
|
const priorityB = statusPriority[b.status] || 500
|
||||||
if (priorityA !== priorityB) {
|
if (priorityA !== priorityB) {
|
||||||
@@ -1197,6 +1202,7 @@ export default {
|
|||||||
this.planQueue = sortedPlans.slice(0, 5)
|
this.planQueue = sortedPlans.slice(0, 5)
|
||||||
|
|
||||||
console.log('查询到的总计划数:', uniquePlans.length, '条')
|
console.log('查询到的总计划数:', uniquePlans.length, '条')
|
||||||
|
console.log('活动计划数:', activePlans.length, '条')
|
||||||
console.log('显示的计划:', this.planQueue.length, '条', this.planQueue)
|
console.log('显示的计划:', this.planQueue.length, '条', this.planQueue)
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
Reference in New Issue
Block a user