|
@@ -36,7 +36,7 @@
|
|
src="../images/icon_check_disabled.png"
|
|
src="../images/icon_check_disabled.png"
|
|
alt=""
|
|
alt=""
|
|
/>
|
|
/>
|
|
- <p class="date">{{ item.trainingDate | dayjsFormatForDate }}</p>
|
|
|
|
|
|
+ <p class="date">{{ item.trainingDate }}</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -59,7 +59,8 @@ export default {
|
|
this.activeRow = row;
|
|
this.activeRow = row;
|
|
try {
|
|
try {
|
|
const res = await getUserTrainingTime({ userId: row.id });
|
|
const res = await getUserTrainingTime({ userId: row.id });
|
|
- this.trainingList = res.data.forEach((item) => {
|
|
|
|
|
|
+ this.trainingList = res.data;
|
|
|
|
+ this.trainingList.forEach((item) => {
|
|
const tempDate = dayjs(item.trainingDate).format("YYYY-MM-DD");
|
|
const tempDate = dayjs(item.trainingDate).format("YYYY-MM-DD");
|
|
const tempNow = dayjs(new Date()).format("YYYY-MM-DD");
|
|
const tempNow = dayjs(new Date()).format("YYYY-MM-DD");
|
|
item.isFinish = dayjs(tempDate).isBefore(tempNow) ? item.isFinish : 2;
|
|
item.isFinish = dayjs(tempDate).isBefore(tempNow) ? item.isFinish : 2;
|