Эх сурвалжийг харах

reactor:用户信息调整

zhangchong 1 жил өмнө
parent
commit
fac8e5ca1d

+ 4 - 7
src/layout/navBars/breadcrumb/user.vue

@@ -12,15 +12,13 @@
 					<el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">小型</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
-		</el-dropdown>
+		</el-dropdown>-->
 		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onSearchClick"  title="菜单搜索">
-			<el-icon>
-				<ele-Search />
-			</el-icon>
+      <SvgIcon name="ele-Search" size="18px"/>
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onLayoutSetingClick" title="布局配置">
-			<i class="icon-skin iconfont"></i>
-		</div>-->
+      <SvgIcon name="icon-skin iconfont" size="18px"/>
+		</div>
 		 <div class="layout-navbars-breadcrumb-user-icon mr10" title="消息">
 			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
 				<template #reference>
@@ -513,7 +511,6 @@ onMounted(() => {
 		cursor: pointer;
 		color: var(--hotline-color-text-main);
 		&:hover {
-			background: var(--hotline-color-user-hover);
 			i {
 				display: inline-block;
 				animation: logoAnimation 0.3s ease-in-out;

+ 8 - 2
src/stores/userInfo.ts

@@ -10,6 +10,7 @@ import { getUserInfo } from "/@/api/login/user"
 export const useUserInfo = defineStore('userInfo', {
 	state: (): UserInfosStates => ({
 		userInfos: {
+			account: '', // 账号
 			name: '',// 姓名
 			phoneNo: '', //电话
 			staffNo: '', // 工号
@@ -20,6 +21,7 @@ export const useUserInfo = defineStore('userInfo', {
 			token: '',
 			showTelControl: false, // 是否展示坐席操作电话面板
 			orgName:'', // 组织名称
+			roles: [], // 角色
 		},
 	}),
 	actions: {
@@ -34,11 +36,13 @@ export const useUserInfo = defineStore('userInfo', {
 			try {
 				// 个人信息
 				let userInfo: any = await getUserInfo();
-				this.userInfos.name = userInfo.result.name ?? '默认名称';
+				this.userInfos.name = userInfo.result.name ?? '暂无名称';
+				this.userInfos.account = userInfo.result.account ?? '';
 				this.userInfos.phoneNo = userInfo.result.phoneNo ?? '';
 				this.userInfos.staffNo = userInfo.result.staffNo ?? '';
 				this.userInfos.defaultTelNo = userInfo.result.defaultTelNo ?? '';
 				this.userInfos.id = userInfo.result.id ?? '';
+				this.userInfos.roles = userInfo.result.roles ?? [];
 				this.userInfos.token = Cookie.get('token') ?? '';
 				this.userInfos.photo = "";
 				this.userInfos.orgName = userInfo.result.organization?.orgName ?? '';
@@ -49,7 +53,8 @@ export const useUserInfo = defineStore('userInfo', {
 				return this.userInfos;
 			} catch (error) {
 				this.userInfos = {
-					name: 'default name',// 姓名
+					account: '暂无名称', // 账号
+					name: '',// 姓名
 					phoneNo: '', //电话
 					staffNo: '', // 工号
 					id: '',
@@ -59,6 +64,7 @@ export const useUserInfo = defineStore('userInfo', {
 					token: '',
 					showTelControl: false, // 是否展示坐席操作电话面板
 					orgName:'', // 组织名称
+					roles: [], // 角色
 				}
 				Session.set('userInfo', this.userInfos);
 				return this.userInfos;

+ 2 - 0
src/types/pinia.d.ts

@@ -15,6 +15,8 @@ declare interface UserInfosState {
 	isDeleted?: boolean;
 	showTelControl: boolean;
 	orgName: string;
+	roles: string[];
+	account: string;
 }
 declare interface UserInfosStates {
 	userInfos: UserInfosState;