diff --git a/screen-vue/src/api/bizRole.js b/screen-vue/src/api/bizRole.js index dcefad1..a985282 100644 --- a/screen-vue/src/api/bizRole.js +++ b/screen-vue/src/api/bizRole.js @@ -10,3 +10,27 @@ export function getHomeRoleList(params) { params: params }) } + +/** + * 获取角色授权的菜单 + */ +export function getHomeRoleMenus(params) { + return request({ + url: '/biz/homeRole/roleMenus', + method: 'get', + params: params + }) +} + +/** + * 给角色授权菜单 + */ +export function getHomeRoleAssign(data) { + return request({ + url: '/biz/homeRole/assign', + method: 'post', + data + }) +} + + diff --git a/screen-vue/src/components/Dialog/proDialog.vue b/screen-vue/src/components/Dialog/proDialog.vue index cd101d1..7a4c453 100644 --- a/screen-vue/src/components/Dialog/proDialog.vue +++ b/screen-vue/src/components/Dialog/proDialog.vue @@ -15,12 +15,14 @@ icon="Refresh" @click="handleReset" v-if="showReset" + :disabled="loading" > 重置 取消 @@ -29,6 +31,8 @@ icon="Check" @click="handleConfirm" class="save-btn" + :loading="loading" + :disabled="loading" > {{ confirmText }} @@ -57,6 +61,10 @@ const props = defineProps({ confirmText: { type: String, default: '保存' + }, + loading: { + type: Boolean, + default: false } }) @@ -90,6 +98,7 @@ const handleConfirm = () => { emit('confirm') } + \ No newline at end of file diff --git a/screen-vue/src/components/Layout/proResizable.vue b/screen-vue/src/components/Table/proResizable.vue similarity index 100% rename from screen-vue/src/components/Layout/proResizable.vue rename to screen-vue/src/components/Table/proResizable.vue diff --git a/screen-vue/src/router/index.js b/screen-vue/src/router/index.js index 7dfb8d9..4e8b934 100644 --- a/screen-vue/src/router/index.js +++ b/screen-vue/src/router/index.js @@ -74,13 +74,19 @@ const routes = [ name: 'Dashboard', component: Dashboard }, - ...generateRoutes() + ...generateRoutes(), + { + path: '/:pathMatch(.*)*', + name: 'Layout404', + component: Page404 + } ] }, { path: '/:pathMatch(.*)*', name: 'Page404', - component: Page404 + component: () => import('@/views/error/404.vue'), + meta: { requiresAuth: true } } ] diff --git a/screen-vue/src/views/system/menu/index.vue b/screen-vue/src/views/system/menu/index.vue index fe3028e..4f449d4 100644 --- a/screen-vue/src/views/system/menu/index.vue +++ b/screen-vue/src/views/system/menu/index.vue @@ -26,7 +26,7 @@ diff --git a/screen-vue/src/views/system/role/list.vue b/screen-vue/src/views/system/role/list.vue index b542fb6..2a84bb6 100644 --- a/screen-vue/src/views/system/role/list.vue +++ b/screen-vue/src/views/system/role/list.vue @@ -52,7 +52,7 @@ @current-change="handleCurrentChange" >