Merge branch 'refs/heads/lihui/feature-20251128110255-多语言动态菜单问题' into milestone-20251125-多语言

package-lock.json

@@ -116,7 +116,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
       "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.2",
@@ -2020,7 +2019,6 @@
       "version": "6.7.2",
       "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz",
       "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==",
-      "peer": true,
       "dependencies": {
         "@fortawesome/fontawesome-common-types": "6.7.2"
       },
@@ -2793,7 +2791,6 @@
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -2804,7 +2801,6 @@
       "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.20.0"
       }
@@ -3341,7 +3337,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -4246,15 +4241,13 @@
       "version": "4.17.21",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash-unified": {
       "version": "1.0.3",
@@ -4724,7 +4717,6 @@
       "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -4802,7 +4794,6 @@
       "resolved": "https://registry.npmmirror.com/sass/-/sass-1.86.3.tgz",
       "integrity": "sha512-iGtg8kus4GrsGLRDLRBRHY9dNVA78ZaS7xr01cWnS7PEMQyFtTqBiyCrfpTYTZXRWM94akzckYjh8oADfFNTzw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -4949,7 +4940,6 @@
       "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -5003,7 +4993,6 @@
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5096,7 +5085,6 @@
       "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.24.2",
         "postcss": "^8.5.1",
@@ -5188,7 +5176,6 @@
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue/-/vue-3.5.13.tgz",
       "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.13",
         "@vue/compiler-sfc": "3.5.13",

src/router/index.js

@@ -2,6 +2,7 @@ import {createRouter, createWebHashHistory} from 'vue-router';
 import {storeToRefs} from "pinia";
 import {useAdminStore, useMessageStore} from "@/store/index.js";
 import API from '@/util/http.js';
+import {ref} from "vue";
 
 
 // 路由定义（包含权限映射 meta.permissionId）
@@ -525,6 +526,7 @@ router.beforeEach(async (to, from, next) => {
     // 3. 正常跳转
     next();
 });
+const rawItems = ref([])
 
 // 全局后置守卫：每次路由切换后执行
 router.afterEach(async (to) => { // 接收to参数获取当前路由信息
@@ -532,13 +534,24 @@ router.afterEach(async (to) => { // 接收to参数获取当前路由信息
     if (to.path === '/login') {
         return;
     }
+// 1. 从localStorage获取数据（localStorage存储的是字符串，需解析）
+    const statusStr = localStorage.getItem('status');
 
+    if (statusStr) {
+        // 示例：如果原始字符串是逗号分隔的格式（如 "1,2,3"），可按分隔符拆分后遍历
+        rawItems.value = statusStr.split(','); // 根据实际格式调整分隔符
+        rawItems.value.forEach((item, index) => {
+            console.log(`索引${index}：`, item.trim()); // trim() 去除空格（可选）
+        });
+    } else {
+        console.log('localStorage中无status数据');
+    }
     try {
         // 执行/getMessage请求
         const newMessageRes = await API({
             url: '/getMessage',
             method: 'POST',
-            data: {}
+            data: {status: rawItems.value}
         });
         console.log('newMessageRes=======================:', newMessageRes.data)
         // 存入全局状态，供所有页面访问

src/views/home.vue

@@ -189,6 +189,7 @@ const selectStatusById = () => {
 
   // 去重并返回结果（单一角色下实际不会有重复）
   return [...new Set(status)];
+
 };
 console.log('权限测试',selectStatusById());
 
@@ -198,6 +199,8 @@ const getMessage = async () => {
   
   try {
     let params = {status: selectStatusById()};
+    console.log('权限测试============',params);
+    localStorage.setItem('status',params.status)
     const res = await API({
       url: '/getMessage',
       method: 'POST',