From 8c2d539f346e456643230c8ed8570ccf5028e125 Mon Sep 17 00:00:00 2001 From: chenxing Date: Thu, 24 Sep 2026 15:15:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(menu):=20modId=20=E6=8C=89=E7=9C=9F?= =?UTF-8?q?=E5=AE=9E=20/base/GetUserMod=20=E6=A0=A1=E6=AD=A3(1/2/3/4/21/89?= =?UTF-8?q?/91)=EF=BC=8C=E6=92=A4=E9=94=80=E4=B8=8A=E7=89=88=E8=AF=AF?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 上版(693aba9)照 31ca694 提交说明的假设值 1000/…/2100，与后端实际返回不符。 真实 modId：已收到1 已发送2 全部通知3 通知统计4 应用设置21 待审核89 抄送91。 - 深层页回到 parentId 2/2/3（发通知22 / 详情23 / 详情24），修正上版 parentId:2000/3000 造成的父菜单高亮失效。 - config/menu.ts、mock GetUserMod 同步真实值并补「抄送给我的」91。 - 说明：/approval 导航本就靠 page 精确匹配(后端 page "/approval " 尾空格已被 resolveMenuPage trim)， 本次主要修 modId 契约与详情撞车/高亮，不改变可点击性。 --- src/assets/config/menu.ts | 13 +++++++------ src/assets/mock/noticeapi.ts | 13 +++++++------ src/router/routes.ts | 37 ++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/assets/config/menu.ts b/src/assets/config/menu.ts index ec4789d..01ce003 100644 --- a/src/assets/config/menu.ts +++ b/src/assets/config/menu.ts @@ -6,12 +6,13 @@ import type { IModule } from "@/store"; */ export function getMenuList(): Promise { const menu: IModule[] = [ - { id: 1000, modId: 1000, name: "已收到", page: "/" }, - { id: 2000, modId: 2000, name: "已发送", page: "/list" }, - { id: 3000, modId: 3000, name: "全部通知", page: "/noticelist" }, - { id: 2100, modId: 2100, name: "待审核", page: "/approval" }, - { id: 4000, modId: 4000, name: "通知统计", page: "/stats" }, - { id: 5000, modId: 5000, name: "应用设置", page: "/setting" }, + { id: 1, modId: 1, name: "已收到", page: "/" }, + { id: 2, modId: 2, name: "已发送", page: "/list" }, + { id: 3, modId: 3, name: "全部通知", page: "/noticelist" }, + { id: 89, modId: 89, name: "待审核", page: "/approval" }, + { id: 4, modId: 4, name: "通知统计", page: "/stats" }, + { id: 21, modId: 21, name: "应用设置", page: "/setting" }, + { id: 91, modId: 91, name: "抄送给我的", page: "/cc" }, ]; return Promise.resolve(menu); } diff --git a/src/assets/mock/noticeapi.ts b/src/assets/mock/noticeapi.ts index 2731f41..467c43f 100644 --- a/src/assets/mock/noticeapi.ts +++ b/src/assets/mock/noticeapi.ts @@ -300,12 +300,13 @@ export default [ ok([ // id/modId 对齐平台模块管理的「配置 ID」（对照 /base/GetUserMod 现行数据）； // icon：YschIcons 图标名，layout 渲染为 iconfont icon-<名称> - { id: 1000, modId: 1000, name: "已收到", parentId: 0, page: "/", icon: "sjx", orderNumber: 1, usable: true, children: [] }, - { id: 2000, modId: 2000, name: "已发送", parentId: 0, page: "/list", icon: "fasong", orderNumber: 2, usable: true, children: [] }, - { id: 3000, modId: 3000, name: "全部通知", parentId: 0, page: "/noticelist", icon: "liebiao", orderNumber: 3, usable: true, children: [] }, - { id: 2100, modId: 2100, name: "待审核", parentId: 0, page: "/approval", icon: "shenpi", orderNumber: 4, usable: true, children: [] }, - { id: 4000, modId: 4000, name: "通知统计", parentId: 0, page: "/stats", icon: "tongji", orderNumber: 5, usable: true, children: [] }, - { id: 5000, modId: 5000, name: "应用设置", parentId: 0, page: "/setting", icon: "shezhi", orderNumber: 6, usable: true, children: [] }, + { id: 1, modId: 1, name: "已收到", parentId: 0, page: "/", icon: "sjx", orderNumber: 1, usable: true, children: [] }, + { id: 2, modId: 2, name: "已发送", parentId: 0, page: "/list", icon: "fasong", orderNumber: 2, usable: true, children: [] }, + { id: 3, modId: 3, name: "全部通知", parentId: 0, page: "/noticelist", icon: "liebiao", orderNumber: 3, usable: true, children: [] }, + { id: 89, modId: 89, name: "待审核", parentId: 0, page: "/approval", icon: "shenpi", orderNumber: 4, usable: true, children: [] }, + { id: 4, modId: 4, name: "通知统计", parentId: 0, page: "/stats", icon: "tongji", orderNumber: 5, usable: true, children: [] }, + { id: 21, modId: 21, name: "应用设置", parentId: 0, page: "/setting", icon: "shezhi", orderNumber: 6, usable: true, children: [] }, + { id: 91, modId: 91, name: "抄送给我的", parentId: 0, page: "/cc", icon: "", orderNumber: 7, usable: true, children: [] }, ]), }, { diff --git a/src/router/routes.ts b/src/router/routes.ts index 7ab0f71..f86d2e2 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -9,12 +9,12 @@ import type { RouteRecordRaw } from "vue-router"; * - /list/detail?serid=&type=、/noticelist/detail?serid=&type= * type: 0=编辑视角(不标读) 1=普通查看(标读) * - * modId 是菜单 ↔ 路由的稳定契约（对照后端 /base/GetUserMod 现行数据，即用户中心 - * 模块管理里的配置 ID）： - * 1000=已收到 2000=已发送 3000=全部通知 2100=待审核 4000=通知统计 5000=应用设置 - * 深层子页不在菜单树，编码沿用 UserBase 范式「父模块 ×10 + 序号」并靠 meta.parentId - * 关联高亮：/list/new=20001、/list/detail=20002（父 2000），/noticelist/detail=30001（父 3000）。 - * 深层页编码不得与任何平台一级模块 ID 重复。 + * modId 是菜单 ↔ 路由的稳定契约（严格对照后端 /base/GetUserMod 现行返回的 modId）： + * 1=已收到 2=已发送 3=全部通知 4=通知统计 21=应用设置 89=待审核 91=抄送给我的 + * （后两条平台已挂一级菜单，page 分别为 /approval、/cc）。 + * 深层子页不在菜单树，靠 meta.parentId 关联高亮父菜单：/list/new=22(父2)、 + * /list/detail=23(父2)、/noticelist/detail=24(父3)。深层页 modId 不得与任何 + * 平台一级模块 ID（含 89/91）重复。 */ const routes: RouteRecordRaw[] = [ // 已收通知（收件箱）：后端菜单 page 配置为 "/"，即应用入口页 @@ -22,14 +22,14 @@ const routes: RouteRecordRaw[] = [ path: "/", name: "notice_accept", component: () => import("@/views/notice/NoticeAccept.vue"), - meta: { title: "已收到", modId: 1000 }, + meta: { title: "已收到", modId: 1 }, }, // 已发送 { path: "/list", name: "notice_list", component: () => import("@/views/notice/NoticeList.vue"), - meta: { title: "已发送", modId: 2000 }, + meta: { title: "已发送", modId: 2 }, }, // 发通知（新建/编辑/转发/模板）：已发送的深层子页，不在菜单里， // layout.vue 按.meta.parentId 推导面包屑「已发送＞发通知」并高亮父菜单 @@ -37,14 +37,14 @@ const routes: RouteRecordRaw[] = [ path: "/list/new", name: "new_notice", component: () => import("@/views/notice/NewNotice.vue"), - meta: { title: "发通知", modId: 20001, parentId: 2000 }, + meta: { title: "发通知", modId: 22, parentId: 2 }, }, // 全部通知（管理端） { path: "/noticelist", name: "notice_manage", component: () => import("@/views/notice/NoticeList.vue"), - meta: { title: "全部通知", modId: 3000 }, + meta: { title: "全部通知", modId: 3 }, }, // 通知详情（同一组件挂两个路由，面包屑/菜单高亮由 meta.parentId 确定父节点： // 已发送下 /list/detail，全部通知下 /noticelist/detail；type 区分是否标读） @@ -52,43 +52,42 @@ const routes: RouteRecordRaw[] = [ path: "/list/detail", name: "notice_list_detail", component: () => import("@/views/notice/NoticeDetails.vue"), - meta: { title: "通知详情", modId: 20002, parentId: 2000 }, + meta: { title: "通知详情", modId: 23, parentId: 2 }, }, { path: "/noticelist/detail", name: "notice_manage_detail", component: () => import("@/views/notice/NoticeDetails.vue"), - meta: { title: "通知详情", modId: 30001, parentId: 3000 }, + meta: { title: "通知详情", modId: 24, parentId: 3 }, }, // 通知统计（旧版行为：整页跳转外部统计系统） { path: "/stats", name: "notice_stats", component: () => import("@/views/notice/NoticeStats.vue"), - meta: { title: "通知统计", modId: 4000 }, + meta: { title: "通知统计", modId: 4 }, }, // 应用设置（发文部门 + 自定义组） { path: "/setting", name: "notice_setting", component: () => import("@/views/notice/NoticeSetting.vue"), - meta: { title: "应用设置", modId: 5000 }, + meta: { title: "应用设置", modId: 21 }, }, - // 待审核（应用内审批；平台模块管理已挂一级菜单，配置 ID = 2100，path = /approval） + // 待审核（应用内审批；平台模块管理已挂一级菜单，配置 ID = 89，path = /approval） { path: "/approval", name: "notice_approval", component: () => import("@/views/notice/NoticeApproval.vue"), - meta: { title: "我的待审核", modId: 2100 }, + meta: { title: "我的待审核", modId: 89 }, }, - // 抄送给我的（流程 NOTIFY 知会；modId 25 深层页不在菜单树，菜单挂载待后端 GetUserMod 配置； - // 勿复用 23——/list/detail 已占，modId 撞车会让菜单解析兜底到错误页面） + // 抄送给我的（流程 NOTIFY 知会；平台模块管理已挂一级菜单，配置 ID = 91，path = /cc） { path: "/cc", name: "notice_cc", component: () => import("@/views/notice/NoticeCc.vue"), - meta: { title: "抄送给我的", modId: 25, parentId: 1 }, + meta: { title: "抄送给我的", modId: 91 }, }, /* ---- 旧版路径兼容重定向（书签、残留的平台模块配置） ---- */