From 0ca11cc2a71fe5e9156943cac1d7cba8851a9c08 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 9 May 2023 17:24:23 +0800
Subject: [PATCH] 学段参数调整，发卡记录类型增加

---
 src/utils/index.js                   | 29 ++++++++++++++++++++++++++++-
 src/views/standard/card/index.vue    | 19 +++++++++++++------
 src/views/standard/setUp/student.vue |  2 +-
 src/views/standard/setUp/teacher.vue |  6 +++---
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 6890601..771ae4e 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -618,8 +618,35 @@ export function setGradeName(num) {
     case 16:
       txt = "大四";
       break;
+    case 51:
+      txt = "一年级";
+      break;
+    case 52:
+      txt = "二年级";
+      break;
+    case 53:
+      txt = "三年级";
+      break;
+    case 54:
+      txt = "四年级";
+      break;
+    case 55:
+      txt = "五年级";
+      break;
+    case 56:
+      txt = "六年级";
+      break;
+    case 57:
+      txt = "七年级";
+      break;
+    case 58:
+      txt = "八年级";
+      break;
+    case 59:
+      txt = "九年级";
+      break;
     default:
-      txt = "未知";
+      txt = "其他";
       break;
   }
   return txt;
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index cd7fc63..5fce5c2 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -47,6 +47,7 @@
             <el-option label="全部" value=""></el-option>
             <el-option label="发卡" :value="0"></el-option>
             <el-option label="补卡" :value="1"></el-option>
+            <el-option label="换班" :value="2"></el-option>
           </el-select>
           <div class="d1">
             <el-date-picker
@@ -136,7 +137,13 @@
           ></el-table-column>
           <el-table-column align="center" label="类型">
             <template slot-scope="scope">
-              {{ scope.row.operationType == 0 ? "发卡" : "补卡" }}
+              {{
+                scope.row.operationType == 0
+                  ? "发卡"
+                  : scope.row.operationType == 1
+                  ? "补卡"
+                  : "换班"
+              }}
             </template></el-table-column
           >
           <el-table-column align="center" label="描述">
@@ -303,14 +310,14 @@ export default {
         if (type == 1) {
           this.query.studentCode = "";
           this.query.studentName = "";
-          query = {...this.query}
+          query = { ...this.query };
           query.classId = this.query.classId[1] ? this.query.classId[1] : "";
         } else if (type == 2) {
-          this.query = {...defauleQuery,studentName:this.query.studentName}
-          query = { ...this.query }
+          this.query = { ...defauleQuery, studentName: this.query.studentName };
+          query = { ...this.query };
         } else if (type == 3) {
-          this.query = {...defauleQuery,studentCode:this.query.studentCode}
-          query = { ...this.query }
+          this.query = { ...defauleQuery, studentCode: this.query.studentCode };
+          query = { ...this.query };
         } else {
           query = { ...this.query };
           query.classId = this.query.classId[1] ? this.query.classId[1] : "";
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index 0b15eda..f675508 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -143,7 +143,7 @@
                 {{ item.studentName }}
               </p>
               <p class="p2" v-if="!query.classId">
-                {{ getGradeName(item.grade) }}﹒{{ item.className }}
+                {{ item.gradeName }}﹒{{ item.className }}
               </p>
               <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
               <p class="p1">长学号：{{ item.studentCode }}</p>
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index bbd680e..cbe986b 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -148,7 +148,7 @@
                 </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
-                    {{ gradeName(item.grade) }}-{{ item.className }}
+                    {{ item.gradeName }}-{{ item.className }}
                   </p>
                   <div class="grade-class">
                     <p>
@@ -184,7 +184,7 @@
                 </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
-                    {{ gradeName(item.grade) }}-{{ item.className }}（{{
+                    {{ item.gradeName }}-{{ item.className }}（{{
                       item.subjectName
                     }}）
                   </p>
@@ -222,7 +222,7 @@
                 </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
-                    {{ gradeName(item.grade) }}-{{ item.gradeName }}（{{
+                    {{ item.gradeName }}（{{
                       item.subjectName
                     }}）
                   </p>
--
libgit2 0.21.4