Merge branch 'develop' into devTee
# Conflicts: # src/modules/12_evaluatePersonal/views/MainPage.vue
This commit is contained in:
commit
4cbf6fa473
8 changed files with 230 additions and 110 deletions
|
|
@ -60,22 +60,22 @@ export const useEvaluateMeetingDataStore = defineStore(
|
|||
const rows = ref<any[]>([]);
|
||||
function fetchData(data: any[]) {
|
||||
const dataList: any[] = data.map((item: any) => ({
|
||||
id: item.Id,
|
||||
createdAt: item.CreatedAt,
|
||||
createdUserId: item.CreatedUserId,
|
||||
lastUpdatedAt: item.LastUpdatedAt,
|
||||
lastUpdateUserId: item.LastUpdateUserId,
|
||||
createdFullName: item.CreatedFullName,
|
||||
lastUpdateFullName: item.LastUpdateFullName,
|
||||
title: item.Tittle,
|
||||
round: item.Round,
|
||||
date: `${date2Thai(item.DateStart as Date, false, true)} - ${date2Thai(
|
||||
item.DateEnd as Date,
|
||||
id: item.id,
|
||||
createdAt: item.createdAt,
|
||||
createdUserId: item.createdUserId,
|
||||
lastUpdatedAt: item.lastUpdatedAt,
|
||||
lastUpdateUserId: item.lastUpdateUserId,
|
||||
createdFullName: item.createdFullName,
|
||||
lastUpdateFullName: item.lastUpdateFullName,
|
||||
title: item.tittle,
|
||||
round: item.round,
|
||||
date: `${date2Thai(item.dateStart as Date, false, true)} - ${date2Thai(
|
||||
item.dateEnd as Date,
|
||||
false,
|
||||
true
|
||||
)}`,
|
||||
result: item.Result,
|
||||
duration: item.Duration,
|
||||
result: item.result,
|
||||
duration: item.duration,
|
||||
}));
|
||||
rows.value = dataList;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue