From 8ef0cf534c359718b96638001126a790ef186bdb Mon Sep 17 00:00:00 2001
From: Jursin <1836059252@qq.com>
Date: Sun, 1 Dec 2024 09:38:45 +0800
Subject: [PATCH] Update ExamList.vue

---
 src/renderer/src/components/ExamList.vue | 121 ++++++++++-------------
 1 file changed, 53 insertions(+), 68 deletions(-)

diff --git a/src/renderer/src/components/ExamList.vue b/src/renderer/src/components/ExamList.vue
index fcd377c..4cf2472 100644
--- a/src/renderer/src/components/ExamList.vue
+++ b/src/renderer/src/components/ExamList.vue
@@ -1,8 +1,8 @@
 <template>
-  <v-card class="mx-auto" max-width="600">
-    <v-container fluid>
-      <v-row justify="center">
-        <v-col cols="12">
+  <v-card class="mx-auto" max-width="600" flat>
+    <v-container fluid class="pa-0">
+      <v-row justify="center" class="ma-0">
+        <v-col cols="12" class="pa-0">
           <v-data-table
             :items="groupedExams"
             :headers="headers"
@@ -11,16 +11,19 @@
             dense
             class="text-h5"
           >
-            <template #item="{ item, index }">
-              <tr :style="{ lineHeight: '2.5rem' }">
+            <template #item="{ item }">
+              <tr :style="{ lineHeight: '2.0rem' }">
                 <td v-if="item.showDate" class="text-h5 date-column" :rowspan="item.rowspan">
-                  {{ item.date }}<br />{{ item.period }}
-                </td>
-                <td :class="['text-h5', 'subject-column', getStatusClass(item)]">
-                  {{ item.name }}
+                  {{ item.date }}<br>{{ item.period }}
                 </td>
+                <td class="text-h5 subject-column">{{ item.name }}</td>
                 <td class="text-h5 time-column">{{ formatTime(item.start) }}</td>
                 <td class="text-h5 time-column">{{ formatTime(item.end) }}</td>
+                <td class="status-column">
+                  <v-chip :color="getStatusColor(item)" dark class="exam-status-chip">
+                    {{ getStatusText(item) }}
+                  </v-chip>
+                </td>
               </tr>
             </template>
             <template #header.date>
@@ -35,6 +38,9 @@
             <template #header.end>
               <span class="text-h5 font-weight-bold">结束</span>
             </template>
+            <template #header.status>
+              <span class="text-h5 font-weight-bold">状态</span>
+            </template>
           </v-data-table>
         </v-col>
       </v-row>
@@ -44,98 +50,87 @@
 
 <script setup lang="ts">
 import { reactive, computed, onMounted, onUnmounted } from 'vue';
-
 const props = defineProps({
   exam: {
     type: Array as () => any[],
     default: () => []
   }
 });
-
 const state = reactive({
   exams: props.exam
 });
-
 function formatPeriod(isoString: string): string {
   const hour = new Date(isoString).getHours();
   if (hour < 12) return '上午';
   else if (hour < 18) return '下午';
   else return '晚上';
 }
-
 const groupedExams = computed(() => {
   const grouped = [];
   let currentDate = '';
   let currentPeriod = '';
-
   sortedExams.value.forEach((exam, index) => {
-    const examDate =
-      new Date(exam.start)
-        .toLocaleDateString('zh-CN', {
-          month: 'numeric',
-          day: 'numeric'
-        })
-        .replace('/', '月') + '日';
+    const examDate = new Date(exam.start).toLocaleDateString('zh-CN', {
+      month: 'numeric',
+      day: 'numeric'
+    }).replace('/', '月') + '日';
     const period = formatPeriod(exam.start);
-
     const showDate = examDate !== currentDate || period !== currentPeriod;
-
     if (showDate) {
       currentDate = examDate;
       currentPeriod = period;
-
-      const rowspan = sortedExams.value.filter(
-        (e) =>
-          new Date(e.start)
-            .toLocaleDateString('zh-CN', { month: 'numeric', day: 'numeric' })
-            .replace('/', '月') +
-            '日' ===
-            currentDate && formatPeriod(e.start) === currentPeriod
+      const rowspan = sortedExams.value.filter(e => 
+        new Date(e.start).toLocaleDateString('zh-CN', { month: 'numeric', day: 'numeric' }).replace('/', '月') + '日' === currentDate &&
+        formatPeriod(e.start) === currentPeriod
       ).length;
-
       grouped.push({ ...exam, date: examDate, period, showDate, rowspan });
     } else {
       grouped.push({ ...exam, date: examDate, period, showDate: false });
     }
   });
-
   return grouped;
 });
-
 const headers = [
   { text: '日期', value: 'date', sortable: false, align: 'center' },
   { text: '科目', value: 'name', align: 'center' },
   { text: '开始', value: 'start', sortable: false, align: 'center' },
-  { text: '结束', value: 'end', sortable: false, align: 'center' }
+  { text: '结束', value: 'end', sortable: false, align: 'center' },
+  { text: '状态', value: 'status', sortable: false, align: 'center' }
 ];
-
 const formatTime = (isoString: string) => {
   const date = new Date(isoString);
   return `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
 };
-
-function getStatusClass(item: any): string {
+function getStatusColor(item: any): string {
   const now = new Date();
   const startTime = new Date(item.start);
   const endTime = new Date(item.end);
-
-  if (now < startTime) return 'status-upcoming';
-  else if (now >= startTime && now <= endTime) return 'status-ongoing';
-  else return 'status-ended';
+  if (now < startTime) return 'orange';
+  else if (now >= startTime && now <= endTime) return 'green';
+  else return 'red';
+}
+function getStatusText(item: any): string {
+  const now = new Date();
+  const startTime = new Date(item.start);
+  const endTime = new Date(item.end);
+  if (now < startTime) {
+    return '未开始';
+  } else if (now >= startTime && now <= endTime) {
+    return '进行中';
+  } else {
+    return '已结束';
+  }
 }
-
 const sortedExams = computed(() => {
   return state.exams.sort((a, b) => new Date(a.start).getTime() - new Date(b.start).getTime());
 });
-
 onMounted(() => {
   const interval = setInterval(() => {
     state.exams = state.exams.map((exam) => ({
       ...exam,
-      status: getStatusClass(exam)
+      status: getStatusText(exam)
     }));
   }, 1000);
-
   onUnmounted(() => {
     clearInterval(interval);
   });
@@ -152,44 +147,34 @@ onMounted(() => {
   font-weight: bold;
 }
 
-.v-card {
-  overflow-x: auto;
-  max-width: 100%; /* 防止表格超出边界 */
-  padding-right: 8px; /* 调整右边距 */
+.exam-status-chip {
+  font-size: 1.5rem !important;
+  text-align: center;
 }
 
 /* 列样式 */
 .date-column,
 .subject-column,
-.time-column {
+.time-column,
+.status-column {
   white-space: nowrap;
   text-align: center;
-  padding-left: 4px;
-  padding-right: 4px;
+  padding: 5px 2px;
 }
 
 .date-column {
-  width: 100px;
+  width: 60px;
 }
 
 .subject-column {
-  width: 140px;
+  width: 50px;
 }
 
 .time-column {
-  width: 80px;
+  width: 50px;
 }
 
-/* 状态样式 */
-.status-upcoming {
-  color: orange;
-}
-
-.status-ongoing {
-  color: #00ff00;
-}
-
-.status-ended {
-  color: red;
+.status-column {
+  width: 60px;
 }
 </style>