From da9346ee2016249d24cc25c97eaeb51ee894bfce Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 19 Oct 2023 14:56:29 +0800
Subject: [PATCH] 全选和排序问题

---
 src/views/standard/test/contrast.vue | 13 ++++++++-----
 src/views/standard/test/index.vue    | 45 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue
index 75b6933..8c66972 100644
--- a/src/views/standard/test/contrast.vue
+++ b/src/views/standard/test/contrast.vue
@@ -94,6 +94,7 @@
           <el-table-column
             prop="rank"
             label="排名"
+            sortable
             align="center"
           ></el-table-column>
           <el-table-column
@@ -104,7 +105,6 @@
           <el-table-column
             prop="className"
             label="班级"
-            sortable
             align="center"
           ></el-table-column>
           <el-table-column
@@ -116,7 +116,6 @@
           <el-table-column
             prop="levelName"
             label="成绩等级"
-            sortable
             align="center"
           ></el-table-column>
         </el-table>
@@ -389,7 +388,11 @@ export default {
         this.title = data.title;
         this.subjectNames = data.subjectName;
         this.tableData = data.classes || [];
-        this.tableData2 = data.students || [];
+        this.tableData2 =
+          data.students.map((item) => {
+            item.score = Number(item.score);
+            return item;
+          }) || [];
       } else {
         this.$message.error(info);
       }
@@ -521,7 +524,7 @@ export default {
     }
   }
 }
-.p1{
-  line-height:18px;
+.p1 {
+  line-height: 18px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index ec4e5e5..49e3be7 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -32,6 +32,9 @@
           multiple
           collapse-tags
         >
+          <el-checkbox v-model="classAll" @change="selectAll" class="select-all"
+            >全选</el-checkbox
+          >
           <el-option
             :disabled="
               query.classIds.length == 1 && query.classIds[0] == item.value
@@ -525,12 +528,7 @@
       </p>
     </div>
     <div v-show="query.classIds.length > 1" class="table-box">
-      <el-empty
-        :imag-size="48"
-        v-if="!classTableLen && !loading"
-        description="暂无数据"
-      ></el-empty>
-      <div class="head-box" v-if="classTableLen">
+      <div class="head-box">
         <div class="tit">
           <p class="txt">已考试卷信息</p>
           <p>
@@ -552,7 +550,12 @@
           ></el-button>
         </el-input>
       </div>
-      <ul class="tab-ul">
+      <el-empty
+        :imag-size="48"
+        v-if="!classTableLen && !loading"
+        description="暂无数据"
+      ></el-empty>
+      <ul class="tab-ul" v-if="classTableLen">
         <template v-for="(item, index) in classTable">
           <li class="tab-li">
             <p class="tab-tit">
@@ -681,6 +684,7 @@ export default {
       total: 0,
       multipleSelection: [], //选中的试卷ID
       classTable: [], //多班级数据
+      classAll: false, //搜索条件多班全选
     };
   },
   computed: {
@@ -731,6 +735,17 @@ export default {
     });
   },
   methods: {
+    //搜索条件多班全选
+    selectAll(val) {
+      this.query.classIds = [];
+      if (val) {
+        this.classList.forEach((item) => {
+          this.query.classIds.push(item.value);
+        });
+      } else {
+        this.query.classIds.push(this.classList[0].value);
+      }
+    },
     // 多班级选择同一试卷
     checkboxDisabled(obj) {
       let id = this.multipleSelection[0] || "";
@@ -943,7 +958,12 @@ export default {
       this._QueryData();
     },
     //切换班级
-    async changeclass() {
+    async changeclass(list) {
+      if (list.length == this.classList.length) {
+        this.classAll = true;
+      } else {
+        this.classAll = false;
+      }
       if (this.query.classIds.length == 0) {
         this.$message.warning("请至少选择一个班级！");
       }
@@ -1078,11 +1098,11 @@ export default {
         if (!query.classId) {
           //多班级
           this.classTable = [];
-          let classIds = []
+          let classIds = [];
           let tableData = [];
           data?.list?.map((item) => {
-            if(!classIds.includes(item.classId)){
-              classIds.push(item.classId)
+            if (!classIds.includes(item.classId)) {
+              classIds.push(item.classId);
             }
             let idx = classIds.indexOf(item.classId);
             if (tableData[idx]) {
@@ -1377,4 +1397,7 @@ div::-webkit-scrollbar-thumb {
     background: transparent;
   }
 }
+.select-all {
+  padding-left: 16px;
+}
 </style>
\ No newline at end of file
--
libgit2 0.21.4