From 321f21c4982c9cec198a27264d722180c79ef913 Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 18:04:35 +0800
Subject: [PATCH] !73 修复全局属性找不到的问题 * Merge remote-tracking branch 'origin/dev' into dev * fix 修复全局属性找不到的问题 * fix 修复变量问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/system/user/profile/index.vue | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 21638e3..ae8fa0f 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -3,14 +3,14 @@
<el-row :gutter="20">
<el-col :span="6" :xs="24">
<el-card class="box-card">
- <template v-slot:header>
+ <template #header>
<div class="clearfix">
<span>涓汉淇℃伅</span>
</div>
</template>
<div>
<div class="text-center">
- <userAvatar :user="state.user" />
+ <userAvatar />
</div>
<ul class="list-group list-group-striped">
<li class="list-group-item">
@@ -27,7 +27,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />鎵�灞為儴闂�
- <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
+ <div v-if="state.user.dept" class="pull-right">{{ state.user.dept?.deptName }} / {{ state.postGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />鎵�灞炶鑹�
@@ -43,7 +43,7 @@
</el-col>
<el-col :span="18" :xs="24">
<el-card>
- <template v-slot:header>
+ <template #header>
<div class="clearfix">
<span>鍩烘湰璧勬枡</span>
</div>
@@ -55,6 +55,9 @@
<el-tab-pane label="淇敼瀵嗙爜" name="resetPwd">
<resetPwd />
</el-tab-pane>
+ <el-tab-pane label="绗笁鏂瑰簲鐢�" name="thirdParty">
+ <thirdParty :auths="state.auths" />
+ </el-tab-pane>
</el-tabs>
</el-card>
</el-col>
@@ -63,16 +66,26 @@
</template>
<script setup name="Profile" lang="ts">
-import userAvatar from "./userAvatar.vue";
-import userInfo from "./userInfo.vue";
-import resetPwd from "./resetPwd.vue";
-import { getUserProfile } from "@/api/system/user";
+import UserAvatar from './userAvatar.vue';
+import UserInfo from './userInfo.vue';
+import ResetPwd from './resetPwd.vue';
+import ThirdParty from './thirdParty.vue';
+import { getAuthList } from '@/api/system/social/auth';
+import { getUserProfile } from '@/api/system/user';
+import { UserVO } from '@/api/system/user/types';
-const activeTab = ref("userinfo");
-const state = ref<Record<string, any>>({
+const activeTab = ref('userinfo');
+interface State {
+ user: Partial<UserVO>;
+ roleGroup: string;
+ postGroup: string;
+ auths: any;
+}
+const state = ref<State>({
user: {},
roleGroup: '',
- postGroup: ''
+ postGroup: '',
+ auths: []
});
const userForm = ref({});
@@ -80,12 +93,18 @@
const getUser = async () => {
const res = await getUserProfile();
state.value.user = res.data.user;
- userForm.value = { ...res.data.user }
+ userForm.value = { ...res.data.user };
state.value.roleGroup = res.data.roleGroup;
state.value.postGroup = res.data.postGroup;
};
+const getAuths = async () => {
+ const res = await getAuthList();
+ state.value.auths = res.data;
+};
+
onMounted(() => {
getUser();
-})
+ getAuths();
+});
</script>
--
Gitblit v1.9.3