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; " > - 重置 - 重置 + 查询 @@ -131,7 +131,7 @@ type="info" plain icon="Upload" - size="default" + size="mini" @click="handleImport" >导入 @@ -141,7 +141,7 @@ type="warning" plain icon="Download" - size="default" + size="mini" @click="handleExport" >导出 @@ -151,7 +151,7 @@ type="primary" plain icon="Plus" - size="default" + size="mini" @click="handleAdd" >新增资产 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 @@ @@ -32,7 +32,7 @@