feat: 完成产线与仓储系统多模块迭代升级
本次迭代覆盖MES与WMS核心业务: 1. 新增接驳台托盘传感器读取与AGV对接能力 2. 完善工单排产、备料流程与权限体系拆分 3. 优化看板接口与前端路由、样式 4. 新增操作日志、库存盘点与角色保护逻辑 5. 修复代理地址、BOM保存等已知问题
This commit is contained in:
@@ -8,13 +8,19 @@
|
||||
<el-icon :size="22"><Monitor /></el-icon>
|
||||
<span v-show="!isCollapse">MES 产线控制</span>
|
||||
</div>
|
||||
<el-menu v-if="menus.length" :default-active="$route.path" router background-color="#001529"
|
||||
text-color="#a6adb4" active-text-color="#409eff" style="border-right:none"
|
||||
:collapse="isCollapse && !isMobile">
|
||||
<el-menu-item v-for="m in menus" :key="m.path" :index="m.path">
|
||||
<el-icon style="margin-right:8px"><component :is="m.icon" /></el-icon>
|
||||
<span>{{ m.name }}</span>
|
||||
</el-menu-item>
|
||||
<el-menu v-if="menus.length" :key="menuKey" :default-active="$route.path" :default-openeds="defaultOpeneds"
|
||||
router background-color="#001529" text-color="#a6adb4" active-text-color="#409eff"
|
||||
style="border-right:none" :collapse="isCollapse && !isMobile">
|
||||
<el-sub-menu v-for="g in menus" :key="g.title" :index="'group:' + g.title">
|
||||
<template #title>
|
||||
<el-icon style="margin-right:8px"><component :is="g.icon" /></el-icon>
|
||||
<span>{{ g.title }}</span>
|
||||
</template>
|
||||
<el-menu-item v-for="m in g.children" :key="m.path" :index="m.path">
|
||||
<el-icon style="margin-right:8px"><component :is="m.icon" /></el-icon>
|
||||
<span>{{ m.name }}</span>
|
||||
</el-menu-item>
|
||||
</el-sub-menu>
|
||||
</el-menu>
|
||||
<div v-else class="no-menu">
|
||||
<p>无可用菜单</p>
|
||||
@@ -57,7 +63,7 @@ import { useRouter } from 'vue-router'
|
||||
import {
|
||||
Document, Calendar, Box, Goods, ShoppingCart, Monitor, Tools,
|
||||
Operation, Link, DataLine, EditPen, Search, CircleCheck, Clock, User,
|
||||
Fold, Expand
|
||||
Key, Fold, Expand
|
||||
} from '@element-plus/icons-vue'
|
||||
import { getUser, logout } from '../utils/auth'
|
||||
import request from '../utils/request'
|
||||
@@ -98,30 +104,60 @@ onBeforeUnmount(() => window.removeEventListener('resize', onScreenChange))
|
||||
|
||||
const menus = computed(() => {
|
||||
const me = getUser()
|
||||
if (!me) return defaultMenus
|
||||
if (!me) return menuGroups.map((g) => ({ ...g, children: [...g.children] }))
|
||||
const owned = me.permissionCodes || []
|
||||
const ok = (c) => me.roleCode === 'SUPER_ADMIN' || owned.includes('*') || owned.includes(c)
|
||||
return defaultMenus.filter((m) => ok(m.code))
|
||||
return menuGroups
|
||||
.map((g) => ({ ...g, children: g.children.filter((m) => ok(m.code)) }))
|
||||
.filter((g) => g.children.length > 0)
|
||||
})
|
||||
|
||||
const defaultMenus = [
|
||||
{ code: 'produce.workorder', name: '工单管理', path: '/work-order', icon: Document },
|
||||
{ code: 'produce.dailyplan', name: '日排产', path: '/daily-plan', icon: Calendar },
|
||||
{ code: 'produce.bom', name: '物料清单', path: '/bom', icon: Goods },
|
||||
{ code: 'produce.material', name: '备料单', path: '/material-request', icon: ShoppingCart },
|
||||
{ code: 'produce.plc', name: '工位组合下发', path: '/plc-send', icon: Monitor },
|
||||
{ code: 'produce.torque', name: '拧紧查询', path: '/torque', icon: Tools },
|
||||
{ code: 'produce.processflow', name: '工艺流程', path: '/process-flow', icon: Operation },
|
||||
{ code: 'produce.station', name: '关联工位', path: '/station', icon: Link },
|
||||
{ code: 'produce.performance', name: '绩效报表', path: '/performance', icon: DataLine },
|
||||
{ code: 'produce.scan', name: '手动报工', path: '/scan', icon: EditPen },
|
||||
{ code: 'produce.trace', name: '工件追溯', path: '/trace', icon: Search },
|
||||
{ code: 'produce.product', name: '产品类型', path: '/product-type', icon: Box },
|
||||
{ code: 'sys.inspect', name: '巡检终端', path: '/inspect', icon: CircleCheck },
|
||||
{ code: 'sys.eventlog', name: '操作日志', path: '/event-log', icon: Clock },
|
||||
{ code: 'sys.rbac', name: '角色权限管理', path: '/rbac', icon: User }
|
||||
// 侧栏菜单按业务域分组(参考 WMS MainLayout):组无权限码,子项各自带 code 过滤,
|
||||
// 组内子项全被过滤则整组隐藏。SUPER_ADMIN / '*' 全放行。
|
||||
const menuGroups = [
|
||||
{
|
||||
title: '生产管理', icon: Document, children: [
|
||||
{ code: 'produce.workorder', name: '工单管理', path: '/work-order', icon: Document },
|
||||
{ code: 'produce.dailyplan', name: '日排产', path: '/daily-plan', icon: Calendar },
|
||||
{ code: 'produce.bom', name: '物料清单', path: '/bom', icon: Goods },
|
||||
{ code: 'produce.material', name: '备料单', path: '/material-request', icon: ShoppingCart },
|
||||
{ code: 'produce.performance', name: '绩效报表', path: '/performance', icon: DataLine }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '现场作业', icon: Monitor, children: [
|
||||
{ code: 'produce.plc', name: '工位组合下发', path: '/plc-send', icon: Monitor },
|
||||
{ code: 'produce.scan', name: '手动报工', path: '/scan', icon: EditPen },
|
||||
{ code: 'produce.trace', name: '工件追溯', path: '/trace', icon: Search },
|
||||
{ code: 'produce.torque', name: '拧紧查询', path: '/torque', icon: Tools },
|
||||
{ code: 'sys.inspect', name: '巡检终端', path: '/inspect', icon: CircleCheck }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '基础配置', icon: Box, children: [
|
||||
{ code: 'produce.processflow', name: '工艺流程', path: '/process-flow', icon: Operation },
|
||||
{ code: 'produce.station', name: '关联工位', path: '/station', icon: Link },
|
||||
{ code: 'produce.product', name: '产品类型', path: '/product-type', icon: Box }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '系统管理', icon: Key, children: [
|
||||
{ code: 'sys.account', name: '账号管理', path: '/account', icon: User },
|
||||
{ code: 'sys.role', name: '角色管理', path: '/role', icon: Key },
|
||||
{ code: 'sys.eventlog', name: '操作日志', path: '/event-log', icon: Clock }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
// 默认展开全部分组;折叠→展开时重建菜单使 default-openeds 重新生效
|
||||
// (Element Plus 折叠会清空内部 openedMenus,default-openeds 仅在初始化时读取一次,
|
||||
// 故用 key 变化强制重建实例 —— 同 WMS 的处理)
|
||||
const defaultOpeneds = computed(() => menus.value.map((g) => 'group:' + g.title))
|
||||
const menuKey = ref(0)
|
||||
watch(isCollapse, (collapsed) => {
|
||||
if (!collapsed) menuKey.value++
|
||||
})
|
||||
|
||||
const userName = computed(() => {
|
||||
const me = getUser()
|
||||
return me ? (me.name || me.username) : '未登录'
|
||||
|
||||
Reference in New Issue
Block a user