From 74c0ee65c774a11df2c8f72cda7cdd7cf818c1fd Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Sat, 17 Jun 2023 22:44:42 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8817=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sys/model/userModel.ts | 5 +- src/store/modules/user.ts | 6 +- .../kc/statistics/evaluationList/index.vue | 23 +- src/views/kc/sys/jwms/Jwms.api.ts | 72 ++++++ src/views/kc/sys/jwms/Jwms.data.ts | 62 +++++ src/views/kc/sys/jwms/JwmsList.vue | 215 ++++++++++++++++++ src/views/kc/sys/jwms/components/JwmsForm.vue | 145 ++++++++++++ .../kc/sys/jwms/components/JwmsModal.vue | 75 ++++++ src/views/site/utils/index.ts | 6 +- 9 files changed, 600 insertions(+), 9 deletions(-) create mode 100644 src/views/kc/sys/jwms/Jwms.api.ts create mode 100644 src/views/kc/sys/jwms/Jwms.data.ts create mode 100644 src/views/kc/sys/jwms/JwmsList.vue create mode 100644 src/views/kc/sys/jwms/components/JwmsForm.vue create mode 100644 src/views/kc/sys/jwms/components/JwmsModal.vue diff --git a/src/api/sys/model/userModel.ts b/src/api/sys/model/userModel.ts index f1d9be7..43c4eb1 100644 --- a/src/api/sys/model/userModel.ts +++ b/src/api/sys/model/userModel.ts @@ -23,7 +23,8 @@ export interface LoginResultModel { userId: string | number; token: string; role: RoleInfo; - userInfo?: any + userInfo?: any; + roleList?: RoleInfo[]; } /** @@ -45,6 +46,8 @@ export interface GetUserInfoModel { userInfo?: any; // 缓存字典项 sysAllDictItems?: any; + + roleList?: RoleInfo[]; } /** diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index d692099..91bec3f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -134,7 +134,8 @@ export const useUserStore = defineStore({ try { const { goHome = true, mode, ...loginParams } = params; const data = await loginApi(loginParams, mode); - const { token, userInfo } = data; + const { token, userInfo, roleList } = data; + userInfo.roleList = roleList; // save token this.setToken(token); this.setTenant(userInfo.loginTenantId); @@ -213,8 +214,9 @@ export const useUserStore = defineStore({ if (!this.getToken) { return null; } - const { userInfo, sysAllDictItems } = await getUserInfo(); + const { userInfo, sysAllDictItems, roleList } = await getUserInfo(); if (userInfo) { + userInfo.roleList = roleList; const { roles = [] } = userInfo; if (isArray(roles)) { const roleList = roles.map((item) => item.value) as RoleEnum[]; diff --git a/src/views/kc/statistics/evaluationList/index.vue b/src/views/kc/statistics/evaluationList/index.vue index 68b6add..c2aa0d7 100644 --- a/src/views/kc/statistics/evaluationList/index.vue +++ b/src/views/kc/statistics/evaluationList/index.vue @@ -53,7 +53,8 @@ 查询 重置 - 导出 + 导出 + 导出 + @@ -100,13 +102,14 @@ diff --git a/src/views/kc/sys/jwms/components/JwmsForm.vue b/src/views/kc/sys/jwms/components/JwmsForm.vue new file mode 100644 index 0000000..e69f255 --- /dev/null +++ b/src/views/kc/sys/jwms/components/JwmsForm.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/kc/sys/jwms/components/JwmsModal.vue b/src/views/kc/sys/jwms/components/JwmsModal.vue new file mode 100644 index 0000000..e24cffb --- /dev/null +++ b/src/views/kc/sys/jwms/components/JwmsModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/site/utils/index.ts b/src/views/site/utils/index.ts index 2f469b7..9e6083c 100644 --- a/src/views/site/utils/index.ts +++ b/src/views/site/utils/index.ts @@ -18,12 +18,12 @@ export const isOpenSSO = import.meta.env.VITE_GLOB_APP_OPEN_SSO == 'true'?true:f export const getUserId = () => { console.log(`🚀 ~ file: index.ts:17 ~ getUserId ~ isOpenSSO:`, isOpenSSO) if(isOpenSSO){ - console.log(`🚀 ~ file: index.ts:17 ~ getUserId ~ isOpenSSO1:`, isOpenSSO) + console.log(`🚀 ~ file: index.ts:17 ~ getUserId ~ userInfo:`, isOpenSSO) const { userInfo } = useUserStore(); //正常取用户 return userInfo?.username; }else{ - console.log(`🚀 ~ file: index.ts:17 ~ getUserId ~ isOpenSSO2:`, isOpenSSO) + console.log(`🚀 ~ file: index.ts:17 ~ getUserId ~ isOpenSSO2:`, isOpenSSO,getUserInfo()) //固定某值 return '2016900057';//教师//2016900057//2002900176//2001900153 // return '2022010920';//学生 @@ -42,7 +42,7 @@ export const getUserSf = () => { /** * 获取当前登录用户信息 */ -export const getUserInfo = () => { +export const getUserInfo = (): any => { const { userInfo } = useUserStore(); return userInfo??{}; }