diff --git a/src/assets/images/login/login_bg.jpg b/src/assets/images/login/login_bg.jpg deleted file mode 100644 index 13af56b..0000000 Binary files a/src/assets/images/login/login_bg.jpg and /dev/null differ diff --git a/src/assets/images/login/login_bg.png b/src/assets/images/login/login_bg.png index f535103..473cfc1 100644 Binary files a/src/assets/images/login/login_bg.png and b/src/assets/images/login/login_bg.png differ diff --git a/src/assets/images/login/login_img.png b/src/assets/images/login/login_img.png deleted file mode 100644 index 7188421..0000000 Binary files a/src/assets/images/login/login_img.png and /dev/null differ diff --git a/src/components.d.ts b/src/components.d.ts index 508bf81..4a86bac 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -7,7 +7,6 @@ export {} /* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] @@ -22,9 +21,7 @@ declare module 'vue' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] @@ -35,7 +32,6 @@ declare module 'vue' { ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElUpload: typeof import('element-plus/es')['ElUpload'] MapSelector: typeof import('./components/MapSelector.vue')['default'] Pagination: typeof import('./components/Pagination/index.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/router/index.js b/src/router/index.js index 1e6805e..9dd2fce 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -181,9 +181,9 @@ router.beforeEach(async (to, from, next) => { const userStore = useUserStore() // 如果没有 token,并且不在白名单中,则重定向到登录 - // if (!userStore.token && !whiteList.includes(to.path)) { - // return next('/login') - // } + if (!userStore.token && !whiteList.includes(to.path)) { + return next('/login') + } // 如果有 token 但还没有添加动态路由 // if (userStore.token && !hasAddRoutes) { diff --git a/src/stores/user.js b/src/stores/user.js index 3d69e03..dde4bba 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -30,9 +30,9 @@ export const useUserStore = defineStore('user', () => { routerList.value = [] // 重置路由 - import('@/router').then(({ resetRouter }) => { - resetRouter() - }) + // import('@/router').then(({ resetRouter }) => { + // resetRouter() + // }) } return { token, setToken, setUserInfo, userInfo, logout } }) diff --git a/src/views/AuthManage/HandleDialog.vue b/src/views/AuthManage/HandleDialog.vue index 1eecce4..41ce99c 100644 --- a/src/views/AuthManage/HandleDialog.vue +++ b/src/views/AuthManage/HandleDialog.vue @@ -6,7 +6,8 @@ const props = defineProps({ required: true, }, row: [Object], - categoryList: { + current_parent_id: [String, Number], + originData: { type: Array, default: [], }, @@ -57,6 +58,8 @@ if (!isAdd.value) { formField.value = { ...props.row, } +} else { + formField.value.parent_id = props.current_parent_id } @@ -78,6 +81,16 @@ if (!isAdd.value) { v-loading="loading" label-width="100" > + + + + + diff --git a/src/views/AuthManage/index.vue b/src/views/AuthManage/index.vue index c5f60d3..190464a 100644 --- a/src/views/AuthManage/index.vue +++ b/src/views/AuthManage/index.vue @@ -14,12 +14,12 @@ placeholder="请输入" style="width: 220px" v-model="queryParams.name" - @keyup.enter="handleQuery" + @keyup.enter="getList" /> - 搜索 + 搜索 重置 @@ -33,19 +33,23 @@ :data="tableData" v-loading="loading" header-row-class-name="table-header" + row-key="id" > - + - + - + diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue index 6bb1e29..951acdf 100644 --- a/src/views/Login/index.vue +++ b/src/views/Login/index.vue @@ -1,13 +1,13 @@