From e278e0588d435ccd4a8a983eab9605d213d753c3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 3 Jul 2025 17:38:18 +0700 Subject: [PATCH 1/2] =?UTF-8?q?fix=20avatar=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82?= =?UTF-8?q?=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CardProfile.vue | 2 ++ src/modules/05_placement/interface/index/Main.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index fc810626d..d6b9fe4cf 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -39,6 +39,8 @@ const profileId = ref(""); async function fetchDataProfile(data: DataProfile) { if (data.profileId) { fetchCheckAvatar(data.profileId); + } else { + profile.avatar = data?.avatar ? data.avatar : ""; } profile.id = data.profileId; profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${ diff --git a/src/modules/05_placement/interface/index/Main.ts b/src/modules/05_placement/interface/index/Main.ts index 74ab35f68..df580772e 100644 --- a/src/modules/05_placement/interface/index/Main.ts +++ b/src/modules/05_placement/interface/index/Main.ts @@ -224,6 +224,7 @@ interface Assign { } interface DataProfile { + avatar?: string; child1: string | null; child1ShortName: string | null; child2: string | null; From 23366f4a678be89fc37a9238d8f96f04aaa67d62 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 4 Jul 2025 13:54:56 +0700 Subject: [PATCH 2/2] =?UTF-8?q?fix=20Avatar=20=3D=3D>=20=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9C=E0=B8=B9?= =?UTF-8?q?=E0=B9=89=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B9=83=E0=B8=99=E0=B8=A3?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_placement/components/PersonalList/Table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index c8fba60ce..dd467f1e0 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -313,7 +313,7 @@ async function getTable() { res.data.result.map((data: any) => { const rowData = { personalId: data.personalId, - avatar: avatar, + avatar: data.avatar ? data.avatar : avatar, name: data.fullName, fullName: data.fullName + " " + data.idCard, idCard: data.idCard,