From b7bd2a7d4e86138432d96d4940e4237a691d4d92 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 29 May 2025 10:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=88=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=AB=98=E4=BA=AE=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.js                      |  6 +++---
 src/views/assetsManage2/webZC/index.vue              | 10 +++++-----
 src/views/myAssets/myOfficialAccount/index.vue       |  3 ---
 .../info.vue => taskManagement-info/index.vue}       |  5 -----
 src/views/taskManagement/index.vue                   | 12 +++++++-----
 5 files changed, 15 insertions(+), 21 deletions(-)
 rename src/views/{taskManagement/info.vue => taskManagement-info/index.vue} (99%)

diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 4a70977..da14b2c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -69,9 +69,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/assetsManage2/webZC/index.vue b/src/views/assetsManage2/webZC/index.vue
index 7f3e2c8..98e85ab 100644
--- a/src/views/assetsManage2/webZC/index.vue
+++ b/src/views/assetsManage2/webZC/index.vue
@@ -113,8 +113,8 @@
                     justify-content: flex-end;
                   "
                 >
-                  <el-button size="default" @click="resetQuery">重置</el-button>
-                  <el-button size="default" type="primary" @click="handleQuery"
+                  <el-button size="mini" @click="resetQuery">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery"
                     >查询</el-button
                   >
                 </el-form-item>
@@ -131,7 +131,7 @@
                   type="info"
                   plain
                   icon="Upload"
-                  size="default"
+                  size="mini"
                   @click="handleImport"
                   >导入</el-button
                 >
@@ -141,7 +141,7 @@
                   type="warning"
                   plain
                   icon="Download"
-                  size="default"
+                  size="mini"
                   @click="handleExport"
                   >导出</el-button
                 >
@@ -151,7 +151,7 @@
                   type="primary"
                   plain
                   icon="Plus"
-                  size="default"
+                  size="mini"
                   @click="handleAdd"
                   >新增资产</el-button
                 >
diff --git a/src/views/myAssets/myOfficialAccount/index.vue b/src/views/myAssets/myOfficialAccount/index.vue
index e9ae8fd..2973188 100644
--- a/src/views/myAssets/myOfficialAccount/index.vue
+++ b/src/views/myAssets/myOfficialAccount/index.vue
@@ -318,7 +318,6 @@ const handleAdd = () => {
     query: {
       pageType: "add",
       type: 1,
-      queryData: formInline,
       name: "MyOfficialAccount",
     },
   });
@@ -333,7 +332,6 @@ const goInfo = (row, id) => {
         pageType: "look",
         type: 1,
         id: row.id,
-        queryData: formInline.value,
       },
     });
   } else if (id === 2) {
@@ -345,7 +343,6 @@ const goInfo = (row, id) => {
         pageType: "change",
         type: 1,
         id: row.id,
-        queryData: formInline.value,
       },
     });
   }
diff --git a/src/views/taskManagement/info.vue b/src/views/taskManagement-info/index.vue
similarity index 99%
rename from src/views/taskManagement/info.vue
rename to src/views/taskManagement-info/index.vue
index e34bf12..f9c407a 100644
--- a/src/views/taskManagement/info.vue
+++ b/src/views/taskManagement-info/index.vue
@@ -772,11 +772,6 @@ const myEchartsRef = ref(null);
 
 // Methods
 const sendBack = () => {
-  if (localStorage.getItem("ismypagination")) {
-    let formInline = JSON.parse(localStorage.getItem("ismypagination"));
-    formInline.isfanhui = true;
-    localStorage.setItem("ismypagination", JSON.stringify(formInline));
-  }
   router.go(-1);
 };
 
diff --git a/src/views/taskManagement/index.vue b/src/views/taskManagement/index.vue
index 9c6092c..54a1de8 100644
--- a/src/views/taskManagement/index.vue
+++ b/src/views/taskManagement/index.vue
@@ -22,7 +22,7 @@
               <el-input
                 v-model="formInline.taskName"
                 placeholder="请输入"
-                style="width: 95%;"
+                style="width: 95%"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -32,7 +32,7 @@
               <el-select
                 v-model="formInline.taskStatus"
                 placeholder="请选择"
-                style="width: 95%;"
+                style="width: 95%"
               >
                 <el-option
                   label="已关闭"
@@ -374,12 +374,13 @@
 </template>
 
 <script>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onUnmounted, getCurrentInstance } from "vue";
 import { useRouter } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 // import myPagination from "@/views/components/Pagination/index.vue";
 // import myDialog from "@/views/components/myDialog/index.vue";
 // import danweiList from "@/views/system/user/danweiList.vue";
+
 import {
   addassetTaskadd,
   getassetTask,
@@ -392,7 +393,7 @@ export default {
   //   components: { myPagination, myDialog, danweiList },
   setup() {
     const router = useRouter();
-
+    const { proxy } = getCurrentInstance();
     // Refs
     const taskDialog = ref(null);
     const liebiaoDialog = ref(null);
@@ -613,8 +614,9 @@ export default {
 
     const goInfo = (row) => {
       getassetTaskid(row.id);
+      proxy.setActiveMenu("/taskManagement");
       router.push({
-        name: "TaskInfo",
+        path: "/taskManagement-info",
         query: {
           pageType: "look",
           id: row.id,