From 7262f3b09b3252d4ea88e0bbb4b7bc66dcd22c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E6=B4=81=E5=BD=B1?= <jy381486980@126.com>
Date: Fri, 28 Feb 2025 13:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HomeWork-java/META-INF/application.xml        |   7 +
 .../views/GradeManager/GradeLMangerList.vue   | 188 +++++++++++-------
 2 files changed, 125 insertions(+), 70 deletions(-)
 create mode 100644 HomeWork-java/META-INF/application.xml

diff --git a/HomeWork-java/META-INF/application.xml b/HomeWork-java/META-INF/application.xml
new file mode 100644
index 0000000..6d17810
--- /dev/null
+++ b/HomeWork-java/META-INF/application.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"
+             version="8">
+
+</application>
diff --git a/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue b/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
index c6fe742..78a29ec 100644
--- a/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
+++ b/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
@@ -3,22 +3,28 @@
     <div align="left" style="margin: 10px 0">
       <el-input v-model="search" placeholder="请输入关键字" style="width: 30%"></el-input>
       <el-button style="margin-left: 10px" type="primary" @click="list">查询</el-button>
-      <el-button style="margin-left: 10px" type="primary" @click="add">新增学生</el-button>
-      <el-button style="margin-left: 10px" type="primary" @click="all">全部学生</el-button>
-      <el-button style="margin-left: 10px" type="primary" @click="qualified">合格学生</el-button>
-      <el-button style="margin-left: 10px" type="primary" @click="unqualified">挂科学生</el-button>
+      <el-button style="margin-left: 10px" type="primary" @click="filterAll">全部学生</el-button>
+      <el-button style="margin-left: 10px" type="success" @click="filterQualified">合格学生</el-button>
+      <el-button style="margin-left: 10px" type="warning" @click="filterUnqualified">挂科学生</el-button>
     </div>
 
-    <el-table :data="computedTableData" :row-class-name="getRowClassName" style="width: 100%">
+    <el-table :data="filteredTableData" style="width: 100%">
       <el-table-column prop="username" label="学号"></el-table-column>
       <el-table-column prop="name" label="姓名"></el-table-column>
       <el-table-column prop="midscore" label="期中成绩(40%)"></el-table-column>
       <el-table-column prop="finalscore" label="期末成绩(40%)"></el-table-column>
       <el-table-column prop="dailyscore" label="平时成绩(20%)"></el-table-column>
       <el-table-column sortable prop="totalscore" label="最终成绩"></el-table-column>
-      <el-table-column>
+      <el-table-column label="成绩等级">
         <template #default="scope">
-          <el-button @click="handleEdit(scope.row)" type="info">编辑</el-button>
+          <span :class="getTagClass(scope.row.totalscore)">
+            {{ getTagText(scope.row.totalscore) }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button class="small-button" @click="handleEdit(scope.row)" type="info">编辑</el-button>
           <el-popconfirm title="确认删除吗?" @confirm="handleDelete(scope.row.username)">
             <template #reference>
               <el-button type="danger" class="delete-button">删除</el-button>
@@ -30,35 +36,33 @@
   </div>
 
   <el-dialog title="编辑学生信息" v-model="dialogVisible" width="30%">
-  <el-form :model="form" label-width="120px">
-    <el-form-item label="学号">
-      <el-input v-model="form.username"></el-input>
-    </el-form-item>
-    <el-form-item label="姓名">
-      <el-input v-model="form.name"></el-input>
-    </el-form-item>
-    <el-form-item label="期中成绩(40%)">
-      <el-input v-model="form.midscore"></el-input>
-    </el-form-item>
-    <el-form-item label="期末成绩(40%)">
-      <el-input v-model="form.finalscore"></el-input>
-    </el-form-item>
-    <el-form-item label="平时成绩(20%)">
-      <el-input v-model="form.dailyscore"></el-input>
-    </el-form-item>
-  </el-form>
-  <template #footer>
-    <el-button @click="dialogVisible = false">取消</el-button>
-    <el-button type="primary" @click="save">保存</el-button>
-  </template>
-</el-dialog>
-
+    <el-form :model="form" label-width="120px">
+      <el-form-item label="学号">
+        <el-input v-model="form.username"></el-input>
+      </el-form-item>
+      <el-form-item label="姓名">
+        <el-input v-model="form.name"></el-input>
+      </el-form-item>
+      <el-form-item label="期中成绩(40%)">
+        <el-input v-model="form.midscore"></el-input>
+      </el-form-item>
+      <el-form-item label="期末成绩(40%)">
+        <el-input v-model="form.finalscore"></el-input>
+      </el-form-item>
+      <el-form-item label="平时成绩(20%)">
+        <el-input v-model="form.dailyscore"></el-input>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup>
 import { ref, computed } from 'vue';
 
-// Dialog 控制
 const dialogVisible = ref(false);
 const form = ref({
   username: '',
@@ -69,6 +73,7 @@ const form = ref({
 });
 
 const search = ref('');
+const filterTag = ref('');
 
 const tableData = ref([
   { username: '202301', name: '张三', midscore: 35, finalscore: 38, dailyscore: 18 },
@@ -94,27 +99,36 @@ const tableData = ref([
 const computedTableData = computed(() =>
   tableData.value.map(row => ({
     ...row,
-    totalscore: row.midscore * 0.4 + row.finalscore * 0.4 + row.dailyscore * 0.2
+    /*totalscore: row.midscore * 0.4 + row.finalscore * 0.4 + row.dailyscore * 0.2*/
+     totalscore: parseFloat((row.midscore * 0.4 + row.finalscore * 0.4 + row.dailyscore * 0.2).toFixed(1))
   }))
 );
 
-const getRowClassName = ({ row }) => {
-  const totalScore = row.totalscore;
-  if (totalScore === undefined || totalScore === null) {
-    console.error(`Error: totalscore is undefined for student ${row.username}`);
-    return 'fail';
+const filteredTableData = computed(() => {
+  let data = computedTableData.value;
+  if (search.value) {
+    data = data.filter(row => 
+      Object.values(row).some(val => 
+        String(val).toLowerCase().includes(search.value.toLowerCase())
+      )
+    );
   }
-
-  console.log('Total Score:', totalScore, 'Class Name:', 
-    totalScore >= 85 ? 'excellent' :
-    totalScore >= 75 ? 'good' :
-    totalScore >= 60 ? 'pass' : 'fail'
-  );
-
-  return totalScore >= 85 ? 'excellent' :
-         totalScore >= 75 ? 'good' :
-         totalScore >= 60 ? 'pass' : 'fail';
-};
+  if (filterTag.value) {
+    data = data.filter(row => {
+      switch (filterTag.value) {
+        case 'all':
+          return true;
+        case 'qualified':
+          return row.totalscore >= 60;
+        case 'unqualified':
+          return row.totalscore < 60;
+        default:
+          return true;
+      }
+    });
+  }
+  return data;
+});
 
 const handleEdit = (student) => {
   dialogVisible.value = true;
@@ -127,38 +141,72 @@ const handleDelete = (username) => {
 };
 
 const list = () => console.log('进行搜索查询');
-const add = () => dialogVisible.value = true;
-const all = () => console.log('显示全部学生');
-const qualified = () => console.log('显示合格学生');
-const unqualified = () => console.log('显示挂科学生');
+const filterAll = () => filterTag.value = 'all';
+const filterQualified = () => filterTag.value = 'qualified';
+const filterUnqualified = () => filterTag.value = 'unqualified';
+
+const getTagClass = (totalScore) => {
+  if (totalScore >= 85) return 'excellent-tag';
+  if (totalScore >= 75) return 'good-tag';
+  if (totalScore >= 60) return 'pass-tag';
+  return 'fail-tag';
+};
 
+const getTagText = (totalScore) => {
+  if (totalScore >= 85) return '优秀';
+  if (totalScore >= 75) return '良好';
+  if (totalScore >= 60) return '及格';
+  return '不及格';
+};
 </script>
 
 <style scoped>
 /* 自定义样式 */
-:deep(tr.el-table__row.excellent) {
-  --el-table-tr-bg-color: rgb(133, 206, 97) !important;
-  color: black !important;
+.excellent-tag {
+  background-color: #85ce61;
+  color: white;
+  padding: 4px 9px;
+  border-radius: 4px;
+  font-size: 14px; 
 }
-:deep(tr.el-table__row.good) {
-  --el-table-tr-bg-color: #409eff !important;
-  color: black !important;
+
+.good-tag {
+  background-color: #409eff;
+  color: white;
+  padding: 4px 9px;
+  border-radius: 4px;
+  font-size: 14px; 
 }
-:deep(tr.el-table__row.pass) {
-  --el-table-tr-bg-color: rgb(235, 180, 99) !important;
-  color: black !important;
+
+.pass-tag {
+  background-color: #eba465;
+  color: white;
+  padding: 4px 9px;
+  border-radius: 4px;
+  font-size: 14px; 
 }
-:deep(tr.el-table__row.fail) {
-  --el-table-tr-bg-color: rgb(247, 137, 137) !important;
-  color: black !important;
+
+.fail-tag {
+  background-color: #f56c6c;
+  color: white;
+  padding: 4px 9px;
+  border-radius: 4px;
+  font-size: 14px; 
 }
 
+.small-button {
+    padding: 2px 6px; 
+    font-size: 13px; 
+  }
+
 .delete-button {
-  background-color: #f44336; /* 深红色背景 */
-  border-color: #d32f2f; /* 较暗的红色边框 */
-  color: white; /* 白色文字 */
-  font-weight: bold; /* 加粗字体 */
-  text-transform: uppercase; /* 字母大写 */
+  background-color: #f44336;
+  border-color: #d32f2f;
+  color: white;
+  /*font-weight: bold;*/
+  text-transform: uppercase;
+  padding: 2px 6px; 
+  font-size: 13px;
 }
 
 .delete-button:hover {
@@ -167,7 +215,7 @@ const unqualified = () => console.log('显示挂科学生');
 }
 
 .delete-button:active {
-  background-color: #c2185b; /* active 状态颜色 */
+  background-color: #c2185b;/* active 状态颜色 */
   border-color: #c2185b;
 }
 </style>
-- 
Gitee