geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

组织机构可配置区域、类型、层级

Browse Source 
支持cas登录
This commit is contained in:
yaoyn
2024-09-19 15:47:06 +08:00
parent 78b05fc000
commit 54def95458
8 changed files with 377 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/system/department/model/index.ts
View File

@ -46,6 +46,7 @@ export interface DepartmentModel {
enabledMark: number; //排序码
departmentLabel?: any; //部门标签
departmentType?: number; //组织类型
areaId?: string;//区域
}
/**

18
src/api/system/login/index.ts
View File

@ -10,6 +10,7 @@ import {
} from './model';
enum Api {
TokenByCas='/',
Login = '/system/login',
Logout = '/system/logout',
GetUserInfo = '/organization/user/current/info',
@ -47,10 +48,10 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
},
);
}
export function singleLoginApi(params, mode) {
return defHttp.post(
export function getTokenByCas(params, mode) {
return defHttp.get(
{
url: Api.Login + '/' + params.ltpasToken,
url: Api.TokenByCas + '?ticket=' + params.ticket,
params:{},
},
{
@ -58,6 +59,17 @@ export function singleLoginApi(params, mode) {
},
);
}
export function singleLoginApi(params, mode) {
return defHttp.post(
{
url: Api.Login + '/' + params.ltpasToken,
params:{},
},
{
errorMessageMode: mode,
},
);
}
/**
* @description: getUserInfo

5
src/router/index.ts
View File

@ -1,7 +1,7 @@
import type { RouteRecordRaw } from 'vue-router';
import type { App } from 'vue';
import { createRouter, createWebHashHistory } from 'vue-router';
import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router';
import { basicRoutes } from './routes';
// 白名单应该包含基本静态路由
@ -17,7 +17,8 @@ getRouteNames(basicRoutes);
// 创建一个可以被 Vue 应用程序使用的路由实例
export const router = createRouter({
// 创建一个 hash 历史记录。
history: createWebHashHistory(import.meta.env.VITE_PUBLIC_PATH),
history: createWebHashHistory(import.meta.env.VITE_PUBLIC_PATH),
//history: createWebHistory(import.meta.env.VITE_PUBLIC_PATH),
// 应该添加到路由的初始路由列表。
routes: basicRoutes as unknown as RouteRecordRaw[],
// 是否应该禁止尾部斜杠。默认为假

11
src/router/routes/index.ts
View File

@ -43,10 +43,21 @@ export const LoginRoute: AppRouteRecordRaw = {
}
};
export const TokenLoginRoute: AppRouteRecordRaw = {
path: '/tokenLogin',
name: 'tokenLogin',
component: () => import('/@/views/secondDev/TokenLogin.vue'),
meta: {
title: t('Token登录'),
ignoreAuth: true//跳过登录检查
}
};
// Basic routing without permissions
// 未经许可的基本路由
export const basicRoutes = [
LoginRoute,
TokenLoginRoute,
RootRoute,
...mainOutRoutes,
REDIRECT_ROUTE,

55
src/store/modules/user.ts
View File

@ -6,7 +6,7 @@ import { PageEnum } from '/@/enums/pageEnum';
import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
import { getAuthCache, setAuthCache } from '/@/utils/auth';
import { GetUserInfoModel, LoginParams, RoleInfo } from '/@/api/system/login/model';
import { doLogout, getUserInfo, loginApi, singleLoginApi } from '/@/api/system/login';
import {doLogout, getTokenByCas, getUserInfo, loginApi, singleLoginApi} from '/@/api/system/login';
import { useI18n } from '/@/hooks/web/useI18n';
import { useMessage } from '/@/hooks/web/useMessage';
import { router } from '/@/router';
@ -91,12 +91,9 @@ export const useUserStore = defineStore({
},
): Promise<GetUserInfoModel | null> {
try {
const { goHome = true, token } = params;
// save token
this.setToken(token);
return this.afterLoginAction(goHome);
const { token } = params;
params.goHome=true;
return await this.tokenLogin(token,params);
} catch (error) {
return Promise.reject(error);
}
@ -113,16 +110,41 @@ export const useUserStore = defineStore({
try {
const { goHome = true, mode, ...loginParams } = params;
const data = await loginApi(loginParams, mode);
const { token } = data;
// save token
this.setToken(token);
return await this.afterLoginAction(goHome);
params.goHome=true;
return await this.tokenLogin(token,params);
} catch (error) {
return Promise.reject(error);
}
},
async casLogin(
params: any
): Promise<GetUserInfoModel | null> {
try {
const data = await getTokenByCas(params, params.mode);
const { token } = data;
return await this.tokenLogin(token,params);
} catch (error) {
return Promise.reject(error);
}
},
/**
* 拿到token后的登录动作
* @param params
*/
async tokenLogin(
token: string,
params: any
): Promise<GetUserInfoModel | null> {
try {
// save token
this.setToken(token);
return await this.afterLoginAction(params.goHome, params.targetURL || params.redirect);
} catch (error) {
return Promise.reject(error);
}
},
/**
* @description: singleLogin
*/
@ -131,17 +153,14 @@ export const useUserStore = defineStore({
): Promise<GetUserInfoModel | null> {
try {
const data = await singleLoginApi(params, params.mode);
const userInfo = await this.getUserInfoAction();
const { token } = data;
// save token
this.setToken(token);
return await this.afterLoginAction(false, params.targetURL || params.redirect);
params.goHome=false;
return await this.tokenLogin(token,params);
} catch (error) {
return Promise.reject(error);
}
},
async afterLoginAction(goHome?: boolean, redirect?): Promise<GetUserInfoModel | null> {
if (!this.getToken) return null;

16
src/utils/http/axios/index.ts
View File

@ -82,11 +82,21 @@ const transform: AxiosTransform = {
timeoutMsg = t('登录超时,请重新登录!');
const userStore = useUserStoreWithOut();
userStore.setToken(undefined);
if (!window.location.hash.includes('login')) {
if (!window.location.hash.includes('login')&&!window.location.pathname.includes('login')
&&!window.location.hash.includes('tokenLogin')&&!window.location.pathname.includes('tokenLogin')) {
userStore.logout(true);
}
const go = useGo();
go('/login');
if(data.urlToRedirectTo){
//登录页面不跳转
if(!window.location.hash.includes('login')&&!window.location.pathname.includes('login')
&&!window.location.hash.includes('tokenLogin')&&!window.location.pathname.includes('tokenLogin')){
window.location.href=data.urlToRedirectTo;
}
options.errorMessageMode="none";
}else{
const go = useGo();
go('/login');
}
break;
default:
if (msg) {

40
src/views/secondDev/TokenLogin.vue Normal file
View File

@ -0,0 +1,40 @@
<template>
<div style="width: 100%; height: 300px; display: flex;justify-content: center;align-items: center;">
<a-spin />
</div>
</template>
<script lang="ts" setup>
import { useUserStore } from '/@/store/modules/user';
import { onMounted } from 'vue';
import { useRouter } from 'vue-router';
const { currentRoute } = useRouter();
const userStore = useUserStore();
onMounted(async () => {
const fullPath = currentRoute.value.fullPath;
let targetURL = ''
let redirect = ''
if (fullPath.includes('targetURL')) {
const list = fullPath.split('targetURL=');
targetURL = list[1];
} else {
const list = fullPath.split('redirect=');
redirect = list[1];
}
let params = {...currentRoute.value.query, targetURL: targetURL,redirect: redirect, mode: 'none',goHome:true }; //不要默认的错误提示
const token=currentRoute.value.query?.token;
//cas ticket的话走一遍后端换成token
const ticket=currentRoute.value.query?.ticket;
if(ticket){
params.ticket=ticket;
await userStore.casLogin(params);
}else if (token) {
await userStore.tokenLogin(token,params);
}
});
</script>
<style lang="less">
</style>

27
src/views/system/department/components/DeptDrawer.vue
View File

@ -4,7 +4,7 @@
@register="registerDrawer"
showFooter
:title="getTitle"
width="45%"
width="50%"
@ok="handleSubmit"
>
<BasicForm @register="registerForm" :style="{ 'margin-right': '10px' }">
@ -112,16 +112,39 @@
defaultValue: 1,
componentProps: {
options: [
{ label: '总部', value: 3, disabled:true },
{ label: '板块', value: 2, disabled:true },
{ label: '公司', value: 1 },
{ label: '部门', value: 0 },
{ label: '部门', value: 0 }
],
onChange: deptTypeChange,
},
required: true,
},
{
field: 'areaId',
label: '行政区域',
component: 'Area',
componentProps: {
placeholder: '请选择行政区域'
},
},
];
const companySchema: FormSchema[] = [
{
field: 'companyLvl',
label: '公司层级',
component: 'RadioButtonGroup',
defaultValue: null,
componentProps: {
options: [
{ label: '三级业务单位', value: 3 },
{ label: '四级项目公司/场站', value: 4 }
],
},
required: false,
},
{
field: 'departmentNature',
label: '公司性质',