diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 3c243e9..1ccc73b 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -112,7 +112,7 @@ border: 1px solid #e5e6e7; background: #FFFFFF none; border-radius:4px; - width: 100%; + width: 100%; } .pagination-container .el-pagination { diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue index bb78fe4..261e5a0 100644 --- a/src/components/TreeSelect/index.vue +++ b/src/components/TreeSelect/index.vue @@ -89,7 +89,7 @@ function initHandle() { proxy.$refs.selectTree.setCurrentKey(selectedValue) // 设置默认选中 defaultExpandedKey.value = [selectedValue] // 设置默认展开 } - }else{ + } else { clearHandle() } }) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c9f516c..a4cf784 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -59,7 +59,6 @@ import RuoYiGit from '@/components/RuoYi/Git' import RuoYiDoc from '@/components/RuoYi/Doc' const store = useStore(); -const router = useRouter(); const getters = computed(() => store.getters); function toggleSideBar() { diff --git a/src/plugins/tab.js b/src/plugins/tab.js index e1ebcec..d9fd580 100644 --- a/src/plugins/tab.js +++ b/src/plugins/tab.js @@ -4,20 +4,21 @@ import router from '@/router' export default { // 刷新当前tab页签 refreshPage(obj) { - const { path, matched } = router.currentRoute.value; + const { path, query, matched } = router.currentRoute.value; if (obj === undefined) { matched.forEach((m) => { if (m.components && m.components.default && m.components.default.name) { if (!['Layout', 'ParentView'].includes(m.components.default.name)) { - obj = { name: m.components.default.name, path: path }; + obj = { name: m.components.default.name, path: path, query: query }; } } }); } return store.dispatch('tagsView/delCachedView', obj).then(() => { - const { path } = obj + const { path, query } = obj router.replace({ - path: '/redirect' + path + path: '/redirect' + path, + query: query }) }) },