diff --git a/platform-web-ui/src/api/tenant.ts b/platform-web-ui/src/api/tenant.ts index f60333e..4df41e4 100644 --- a/platform-web-ui/src/api/tenant.ts +++ b/platform-web-ui/src/api/tenant.ts @@ -34,5 +34,10 @@ export const updateTenantApi = (data: ISysTenant) => { /** 删除 */ export const deleteTenantApi = (id: string) => { - return httpDelete>(`/sys/tenant/${id}`) + return httpDelete>(`/sys/tenant/${id}`) +} + +/** 重置租户数据 */ +export const resetDataTenantApi = (id: string) => { + return httpPost>(`/sys/tenant/reset/data/${id}`) } diff --git a/platform-web-ui/src/assets/error-page/404.svg b/platform-web-ui/src/assets/error-page/404.svg index d59f6f1..fb9395e 100644 --- a/platform-web-ui/src/assets/error-page/404.svg +++ b/platform-web-ui/src/assets/error-page/404.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/platform-web-ui/src/assets/layouts/logo-text-1.png b/platform-web-ui/src/assets/layouts/logo-text-1.png index 363b509..cd779b7 100644 Binary files a/platform-web-ui/src/assets/layouts/logo-text-1.png and b/platform-web-ui/src/assets/layouts/logo-text-1.png differ diff --git a/platform-web-ui/src/assets/layouts/logo-text-2.png b/platform-web-ui/src/assets/layouts/logo-text-2.png index aafb1ba..85db3c6 100644 Binary files a/platform-web-ui/src/assets/layouts/logo-text-2.png and b/platform-web-ui/src/assets/layouts/logo-text-2.png differ diff --git a/platform-web-ui/src/components/ImageUpload/index.vue b/platform-web-ui/src/components/ImageUpload/index.vue index ec10eb2..c1ba0f4 100644 --- a/platform-web-ui/src/components/ImageUpload/index.vue +++ b/platform-web-ui/src/components/ImageUpload/index.vue @@ -94,11 +94,13 @@ $size: 100px; cursor: pointer; position: relative; overflow: hidden; + width: $size; } .avatar-wrapper { border: 2px solid #8c939d; border-radius: 3px; + width: $size; } .avatar-uploader .el-upload:hover { diff --git a/platform-web-ui/src/store/modules/user.ts b/platform-web-ui/src/store/modules/user.ts index da10836..4512d64 100644 --- a/platform-web-ui/src/store/modules/user.ts +++ b/platform-web-ui/src/store/modules/user.ts @@ -111,8 +111,12 @@ export const useUserStore = defineStore("user", () => { userInfo.value = undefined accessToken.value = "" resetRouter() + // 关闭 WebSocket noticeStore.stopWebSocket() + noticeStore.broadcast = [] + noticeStore.pushNotices = [] + buttons.value = [] menus.value = [] _resetTagsView() diff --git a/platform-web-ui/src/utils/service.ts b/platform-web-ui/src/utils/service.ts index 3c56150..e8d5077 100644 --- a/platform-web-ui/src/utils/service.ts +++ b/platform-web-ui/src/utils/service.ts @@ -44,7 +44,7 @@ function createService() { case 400010: case 400011: case 400012: - logout(apiData.message) + logout(apiData.message, "登录过期") return Promise.reject(new Error(apiData.message)) case 400444: case 400445: @@ -55,14 +55,24 @@ function createService() { return resendRequest(service, response) case 400446: // 此系统用户 没有操作 租户 的权限 - ElMessage.error(`您没有操作 ${tenantStore.getCurrentTenant().name} 租户的权限`) - tenantStore.setCurrentTenant(apiData.data as ISimpleTenant) - return resendRequest(service, response) + if (apiData.data) { + ElMessage.error(`您没有操作 ${tenantStore.getCurrentTenant().name} 租户的权限`) + tenantStore.setCurrentTenant(apiData.data as ISimpleTenant) + return resendRequest(service, response) + } else { + logout("暂无任何租户的操作权限", "权限不足") + return Promise.reject(new Error("暂无任何租户的操作权限")) + } case 400447: // 此用户 没有操作 项目 的权限 - ElMessage.error(`您没有操作 ${projectStore.getCurrentProject().projectName} 项目的权限`) - projectStore.setCurrentProject(apiData.data as ISimpleProject) - return resendRequest(service, response) + if (apiData.data) { + ElMessage.error(`您没有操作 ${projectStore.getCurrentProject().projectName} 项目的权限`) + projectStore.setCurrentProject(apiData.data as ISimpleProject) + return resendRequest(service, response) + } else { + logout("暂无任何项目的操作权限", "权限不足") + return Promise.reject(new Error("暂无任何项目的操作权限")) + } default: // 不是正确的 Code ElMessage.error(apiData.message || "Error") @@ -78,7 +88,7 @@ function createService() { break case 401: // Token 过期时 - logout("认证已经过期，请从新登录！") + logout("认证已经过期，请重新登录！", "重新登录") break case 403: error.message = "拒绝访问" @@ -128,9 +138,9 @@ function resendRequest(service: AxiosInstance, response: AxiosResponse) { } // 退出登录 -function logout(message: string) { - ElMessageBox.confirm(message || "登录已经过期，需要重新登录", "登录过期", { - confirmButtonText: "重新登录", +function logout(title: string, message: string) { + ElMessageBox.confirm(message || "登录已经过期，需要重新登录", title, { + confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }) @@ -152,7 +162,7 @@ function createRequest(service: AxiosInstance) { const defaultConfig = { headers: { // 携带 Token - Authorization: tokenValue ? tokenValue : undefined, + Authorization: tokenValue ? tokenValue : "", "x-tenant-id": tenantId, "x-project-id": projectId, "Content-Type": "application/json" diff --git a/platform-web-ui/src/views/pre/user/index.vue b/platform-web-ui/src/views/pre/user/index.vue index 35bb45d..13c9a85 100644 --- a/platform-web-ui/src/views/pre/user/index.vue +++ b/platform-web-ui/src/views/pre/user/index.vue @@ -97,7 +97,10 @@ >编辑   - + 更多 diff --git a/platform-web-ui/src/views/project/list/index.vue b/platform-web-ui/src/views/project/list/index.vue index 3741406..f2214fb 100644 --- a/platform-web-ui/src/views/project/list/index.vue +++ b/platform-web-ui/src/views/project/list/index.vue @@ -73,12 +73,8 @@ diff --git a/platform-web-ui/src/views/sys/tenant/create.vue b/platform-web-ui/src/views/sys/tenant/create.vue index 6887abb..8569fdb 100644 --- a/platform-web-ui/src/views/sys/tenant/create.vue +++ b/platform-web-ui/src/views/sys/tenant/create.vue @@ -8,6 +8,8 @@