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

支持cas登录

src/api/system/department/model/index.ts

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

src/api/system/login/index.ts

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

src/router/index.ts

@@ -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';
 
 // 白名单应该包含基本静态路由
@@ -18,6 +18,7 @@ getRouteNames(basicRoutes);
 export const router = createRouter({
   // 创建一个 hash 历史记录。
     history: createWebHashHistory(import.meta.env.VITE_PUBLIC_PATH),
+    //history: createWebHistory(import.meta.env.VITE_PUBLIC_PATH),
   // 应该添加到路由的初始路由列表。
   routes: basicRoutes as unknown as RouteRecordRaw[],
   // 是否应该禁止尾部斜杠。默认为假

src/router/routes/index.ts

@@ -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,

src/store/modules/user.ts

@@ -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;
+        const { token } = params;
-
+        params.goHome=true;
-        // save token
+        return await this.tokenLogin(token,params);
-        this.setToken(token);
-
-        return this.afterLoginAction(goHome);
       } catch (error) {
         return Promise.reject(error);
       }
@@ -113,12 +110,37 @@ export const useUserStore = defineStore({
       try {
         const { goHome = true, mode, ...loginParams } = params;
         const data = await loginApi(loginParams, mode);
-
         const { token } = data;
+        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(goHome);
+              return await this.afterLoginAction(params.goHome, params.targetURL || params.redirect);
           } catch (error) {
               return Promise.reject(error);
           }
@@ -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
+          params.goHome=false;
-        this.setToken(token);
+        return await this.tokenLogin(token,params);
-
-        return await this.afterLoginAction(false, params.targetURL || params.redirect);
       } catch (error) {
         return Promise.reject(error);
       }
     },
+
     async afterLoginAction(goHome?: boolean, redirect?): Promise<GetUserInfoModel | null> {
       if (!this.getToken) return null;
 

src/utils/http/axios/index.ts

@@ -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);
                 }
+                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) {

src/views/secondDev/TokenLogin.vue

@@ -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>

src/views/system/department/components/DeptDrawer.vue

@@ -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: '公司性质',