From 31436559200262f9fba55e8d686b91b6abcaff08 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 19 Oct 2023 16:10:46 +0800
Subject: [PATCH] 多班级样式问题，成绩登记设置问题

---
 package.json                         |  5 +++--
 src/main.js                          |  3 +++
 src/views/standard/test/analysis.vue |  5 +++--
 src/views/standard/test/contrast.vue |  9 ++++++---
 src/views/standard/test/index.vue    | 65 +++++++++++++++++++++++++++++++++++++++--------------------------
 5 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 814e581..9e2115a 100755
--- a/package.json
+++ b/package.json
@@ -20,9 +20,10 @@
     "script-ext-html-webpack-plugin": "^2.1.5",
     "vue": "^2.6.11",
     "vue-i18n": "^8.4.0",
+    "vue-masonry": "^0.16.0",
     "vue-router": "^3.5.1",
-    "vuex": "^3.6.2",
-    "vuedraggable": "^2.24.3"
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",
diff --git a/src/main.js b/src/main.js
index b36367a..e7a2f78 100755
--- a/src/main.js
+++ b/src/main.js
@@ -20,10 +20,13 @@ import "@/router/permission"
 import "@/assets/css/base.css"
 import "@/assets/css/index.scss"
 
+import { VueMasonryPlugin } from 'vue-masonry'
+
 Vue.config.productionTip = false
 Vue.use(ElementUI)
 Vue.use(globalPlugin)
 Vue.use(permission)
+Vue.use(VueMasonryPlugin)
 
 NProgress.inc(0.2)
 NProgress.configure({ easing: "ease", speed: 500, showSpinner: false })
diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue
index 2e5d0db..1989746 100644
--- a/src/views/standard/test/analysis.vue
+++ b/src/views/standard/test/analysis.vue
@@ -39,6 +39,7 @@
           >
         </div>
         <el-button
+          v-if="!status"
           class="setMinScore"
           @click="diaMinScore = true"
           round
@@ -530,7 +531,7 @@ export default {
   data() {
     return {
       role: "",
-      status: 0,
+      status: 0,// 1:已归档试卷
       tableMaxHeight: 600,
       loading: false,
       exportLoading: false,
@@ -543,7 +544,7 @@ export default {
       score: "",
       tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
       type: 0,
-      paperModifyLog: {
+      paperModifyLog: { //修改信息
         realName: "",
         modifiedTime: "",
       },
diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue
index 8c66972..5296236 100644
--- a/src/views/standard/test/contrast.vue
+++ b/src/views/standard/test/contrast.vue
@@ -338,15 +338,18 @@ export default {
       }
     },
     savefrom() {
-      this.tableData = [];
-      this.tableData2 = [];
-
       for (let i = 0; i < this.fromData.levels.length; i++) {
         if (this.fromData.levels[i].includes("")) {
           this.$message.warning("请补全编号" + (i + 1) + "设置信息！");
           return;
         }
       }
+      if (this.fromData.levels.length == 0) {
+        this.$message.warning("请添加等级设置！");
+        return
+      }
+      this.tableData = [];
+      this.tableData2 = [];
       this.defaultLevels.levelType = this.fromData.levelType;
       this.defaultLevels.levels = [...this.fromData.levels];
       sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData));
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index 49e3be7..ced0d0a 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -32,9 +32,11 @@
           multiple
           collapse-tags
         >
-          <el-checkbox v-model="classAll" @change="selectAll" class="select-all"
-            >全选</el-checkbox
-          >
+          <p class="select-all">
+            <el-checkbox v-model="classAll" @change="selectAll"
+              >全选</el-checkbox
+            >
+          </p>
           <el-option
             :disabled="
               query.classIds.length == 1 && query.classIds[0] == item.value
@@ -114,19 +116,22 @@
     </div>
     <div v-show="query.classIds.length == 1" class="table-box">
       <el-radio-group
+        v-if="query.startDay != query.endDay"
         v-model="tabIndex"
         @change="changeTab"
         style="margin-bottom: 20px"
       >
         <template v-for="(item, index) in tabList">
-          <el-radio-button
-            v-if="index == 0 || query.startDay != query.endDay"
-            :key="index"
-            :label="index + 1"
-            >{{ item }}</el-radio-button
-          >
+          <el-radio-button :key="index" :label="index + 1">{{
+            item
+          }}</el-radio-button>
         </template>
       </el-radio-group>
+      <div class="head-box" v-else>
+        <div class="tit">
+          <p class="txt">已考试卷信息</p>
+        </div>
+      </div>
       <div v-show="tabIndex == 1" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
           <el-table-column
@@ -527,12 +532,16 @@
         >
       </p>
     </div>
-    <div v-show="query.classIds.length > 1" class="table-box">
+    <div
+      v-show="query.classIds.length > 1"
+      class="table-box"
+      v-loading="loading"
+    >
       <div class="head-box">
         <div class="tit">
           <p class="txt">已考试卷信息</p>
           <p>
-            共筛选出{{ classTableLen }}个班级的已考试卷，<em class="red"
+            共筛选出{{ classTable.length }}个班级的已考试卷，<em class="red"
               >不同班级请选择同一份试卷进行对比</em
             >
           </p>
@@ -552,10 +561,17 @@
       </div>
       <el-empty
         :imag-size="48"
-        v-if="!classTableLen && !loading"
+        v-if="total === 0 && !loading"
         description="暂无数据"
       ></el-empty>
-      <ul class="tab-ul" v-if="classTableLen">
+      <ul
+        class="tab-ul"
+        v-if="classTable.length"
+        v-masonry
+        transition-duration="0s"
+        gutter="0"
+        item-selector=".tab-li"
+      >
         <template v-for="(item, index) in classTable">
           <li class="tab-li">
             <p class="tab-tit">
@@ -610,7 +626,7 @@
           </li>
         </template>
       </ul>
-      <p class="btn-box" v-if="classTableLen">
+      <p class="btn-box" v-if="classTable.length">
         <el-button @click="linkToContrast">生成对比报表</el-button>
       </p>
     </div>
@@ -681,21 +697,12 @@ export default {
       answerList: [], //设置多卷内容供tableStage表格数据用
       page: 1,
       size: 20,
-      total: 0,
+      total: null,
       multipleSelection: [], //选中的试卷ID
       classTable: [], //多班级数据
       classAll: false, //搜索条件多班全选
     };
   },
-  computed: {
-    classTableLen: function () {
-      let len = 0;
-      this.classTable?.map((item) => {
-        item.length ? (len += 1) : "";
-      });
-      return len;
-    },
-  },
   async created() {
     this.code = localStorage.getItem("csCode") || "";
     this.role =
@@ -718,6 +725,7 @@ export default {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
       // if (that.$route.path == "/test") {
+      that.multipleSelection = [];
       that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
       that._QueryClassList2();
       await that._QueryClassList();
@@ -745,6 +753,7 @@ export default {
       } else {
         this.query.classIds.push(this.classList[0].value);
       }
+      this.changeclass(this.query.classIds);
     },
     // 多班级选择同一试卷
     checkboxDisabled(obj) {
@@ -1053,8 +1062,6 @@ export default {
     },
     //单卷测练
     async examReportList(msg) {
-      this.multipleSelection = [];
-      this.loading = true;
       let query = {};
       for (let key in this.query) {
         if (this.query[key] != "") {
@@ -1079,6 +1086,9 @@ export default {
           return;
         }
       }
+      this.classTable = [];
+      this.multipleSelection = [];
+      this.loading = true;
       if (this.query.classIds.length == 1) {
         query.classId = query.classIds[0];
         query.page = this.page;
@@ -1301,6 +1311,7 @@ div::-webkit-scrollbar-thumb {
   padding: 16px;
   background: #f8f8f8;
   border-radius: 5px;
+  min-height: 300px;
   :deep(.fa-arrow-right) {
     padding-left: 2px;
   }
@@ -1399,5 +1410,7 @@ div::-webkit-scrollbar-thumb {
 }
 .select-all {
   padding-left: 16px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #e2e2e2;
 }
 </style>
\ No newline at end of file
--
libgit2 0.21.4