From c27ab8656f6d9d067cf1cec274077cb369bb9bc6 Mon Sep 17 00:00:00 2001
From: xuhongjie <1943105267@qq.com>
Date: Sat, 24 May 2025 17:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=9A=E7=BA=A7=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            |  2 +-
 src/layout/components/Sidebar/index.vue | 12 +++++++-----
 src/store/modules/permission.js         |  6 +++---
 src/views/test/info/index.vue           | 19 +++++++++++++++++++
 src/views/test/test1/index.vue          | 16 ++++++++++++++++
 5 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 src/views/test/info/index.vue
 create mode 100644 src/views/test/test1/index.vue

diff --git a/package.json b/package.json
index 3a5bb58..e7ed692 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "nprogress": "0.2.0",
     "pinia": "^2.1.7",
     "splitpanes": "3.1.5",
-    "vue": "3.4.31",
+    "vue": "^3.5.11",
     "vue-cropper": "1.1.1",
     "vue-router": "4.4.0",
     "vuedraggable": "4.1.0"
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 3ef34ab..80290fe 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    :class="{ 'has-logo': showLogo }"
-    class="sidebar-container"
-  >
+  <div :class="{ 'has-logo': showLogo }" class="sidebar-container">
     <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
     <div class="sever-TITLE">太仓市网络和数据资产采集管理系统</div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
@@ -34,7 +31,7 @@ import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.module.scss";
 import useAppStore from "@/store/modules/app";
 import useSettingsStore from "@/store/modules/settings";
-import  usePermissionStore  from "@/store/modules/permission";
+import usePermissionStore from "@/store/modules/permission";
 
 const route = useRoute();
 const appStore = useAppStore();
@@ -68,7 +65,12 @@ const getMenuTextColor = computed(() => {
 });
 
 const activeMenu = computed(() => {
+  const parentName = route.query.parentName;
+
   const { meta, path } = route;
+  if (parentName) {
+    return parentName;
+  }
   if (meta.activeMenu) {
     return meta.activeMenu;
   }
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 3f7d000..00212a9 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -67,9 +67,9 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
     if (type && route.children) {
       route.children = filterChildren(route.children);
     }
-    if (extractPrefix(route.path)) {
-      route.meta.activeMenu = extractPrefix(route.path);
-    }
+    // if (extractPrefix(route.path)) {
+    //   route.meta.activeMenu = extractPrefix(route.path);
+    // }
     if (route.component) {
       // Layout ParentView 组件特殊处理
       if (route.component === "Layout") {
diff --git a/src/views/test/info/index.vue b/src/views/test/info/index.vue
new file mode 100644
index 0000000..b7b9026
--- /dev/null
+++ b/src/views/test/info/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    11111
+  </div>
+</template>
+
+<script setup>
+  import { onBeforeMount  } from "vue";
+import { useRouter ,useRoute } from "vue-router";
+  const route = useRoute()
+
+ 
+</script>
+
+<style  scoped>
+div{
+    color: black;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/test/test1/index.vue b/src/views/test/test1/index.vue
new file mode 100644
index 0000000..59be6ba
--- /dev/null
+++ b/src/views/test/test1/index.vue
@@ -0,0 +1,16 @@
+<template>
+     <div>
+    <button @click="getinfo">编辑</button>
+     </div>
+    </template>
+    
+    <script setup>
+    
+    import { useRouter ,useRoute } from "vue-router";
+    const router = useRouter();
+
+    const getinfo = () => {
+
+     router.push({ path: "/test/info",query:{parentName:"/test/test1"} });
+    };
+    </script>
\ No newline at end of file