测试问题

梁保满
1 parent f04179ad
Showing 3 changed files with 78 additions and 23 deletions
src/views/standard/test/analysis.vue
src/views/standard/test/contrast.vue
src/views/standard/test/index.vue
@@ -1003,7 +1003,7 @@ div::-webkit-scrollbar-thumb {
   .setMinScore {
     position: absolute;
     bottom: 0;
-    right: 50px;
+    right: 0px;
   }
 }
 .score-ipt {
@@ -46,11 +46,13 @@
             align="center"
             fixed
           ></el-table-column>
-          <el-table-column
-            prop="count"
-            label="测验人数/班级人数"
-            align="center"
-          ></el-table-column>
+          <el-table-column label="测验人数/班级人数" align="center" width="84">
+            <template slot-scope="scope">
+              <p v-for="(item, index) in scope.row.count.split('/')">
+                {{ item }}{{ index == 0 ? "/" : "" }}
+              </p>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="percent"
             label="参与度"
@@ -175,9 +177,9 @@
               <p class="dia-tab-tit">
                 <span class="item1">编号</span>
                 <span class="item2"><i>*</i>等级名称</span>
-                <span class="item2"><i>*</i>等级最高</span>
-                <span class="item2"><i>*</i>等级最低</span>
-                <span class="item1"></span>
+                <span class="item3"><i>*</i>等级最高</span>
+                <span class="item3"><i>*</i>等级最低</span>
+                <span class="item"></span>
               </p>
               <div
                 class="dia-tab-item"
@@ -192,29 +194,42 @@
                     @keydown.native="keydownRange($event)"
                   ></el-input>
                 </p>
-                <p class="item2">
+                <p class="item3">
                   <el-input
                     class="score-ipt"
                     type="number"
                     v-model="item[1]"
                     :min="item[2]"
-                    :max="index == 0 ? 150 : fromData.levels[index - 1][2]"
+                    :max="
+                      index == 0 ? 100 : fromData.levels[index - 1][2] - 0.1
+                    "
                     @keydown.native="keydownRange($event)"
                   ></el-input>
-                  {{ fromData.levelType == 1 ? "%" : "分" }} -
+                  %
+                  <template v-if="fromData.levelType == 0">
+                    ({{
+                      Number(((item[1] / 100) * examPaperScore).toFixed(1))
+                    }}分)
+                  </template>
                 </p>
-                <p class="item2">
+                <p>~</p>
+                <p class="item3">
                   <el-input
                     class="score-ipt"
                     type="number"
                     v-model="item[2]"
                     :min="0"
-                    :max="item[1]"
+                    :max="item[1] - 1"
                     @keydown.native="keydownRange($event)"
                   ></el-input>
-                  {{ fromData.levelType == 1 ? "%" : "分" }}
+                  %
+                  <template v-if="fromData.levelType == 0">
+                    ({{
+                      Number(((item[2] / 100) * examPaperScore).toFixed(1))
+                    }}分)
+                  </template>
                 </p>
-                <p class="item1">
+                <p class="item">
                   <el-link
                     type="danger"
                     :underline="false"
@@ -277,12 +292,13 @@ export default {
       tableMaxHeight: 600,
       tableData: [],
       tableData2: [],
+      examPaperScore: 100, //卷面最高分
     };
   },
-  created() {
+  async created() {
     this.ids = this.$route.query.ids;
-    this._QueryDefaultLevels();
-    this._QueryData();
+    await this._QueryData();
+    await this._QueryDefaultLevels();
   },
   destroyed() {
     sessionStorage.setItem("levelFromData", "");
@@ -338,6 +354,7 @@ export default {
       }
     },
     savefrom() {
+      console.log(this.fromData);
       for (let i = 0; i < this.fromData.levels.length; i++) {
         if (this.fromData.levels[i].includes("")) {
           this.$message.warning("请补全编号" + (i + 1) + "设置信息！");
@@ -346,8 +363,23 @@ export default {
       }
       if (this.fromData.levels.length == 0) {
         this.$message.warning("请添加等级设置！");
-        return
+        return;
+      }
+      let nums = [];
+      let ERR_OK = false;
+      this.fromData.levels.map((item) => {
+        nums.push(Number(item[1]));
+        nums.push(Number(item[2]));
+      });
+      for (let i = 0; i < nums.length; i++) {
+        console.log(nums[i + 1] && (nums[i + 1] >= nums[i]))
+        if (nums[i + 1] && (nums[i + 1] >= nums[i])) {
+          ERR_OK = true;
+          this.$message.warning("高等级比例不能低于低等级比例！请检查");
+          break;
+        }
       }
+      if (ERR_OK) return;
       this.tableData = [];
       this.tableData2 = [];
       this.defaultLevels.levelType = this.fromData.levelType;
@@ -381,6 +413,15 @@ export default {
     async _QueryData(params) {
       let query = {};
       if (params) {
+        if (params.levelType == 0) {
+          params.levels = params.levels.map((item) => {
+            console.log(item);
+            item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1);
+            item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1);
+            return item;
+          });
+        }
+
         query = { ...params };
       }
       const { data, info, status } = await this.$request.examMultiClassReport({
@@ -389,6 +430,7 @@ export default {
       });
       if (status === 0) {
         this.title = data.title;
+        this.examPaperScore = data.examPaperScore || 100;
         this.subjectNames = data.subjectName;
         this.tableData = data.classes || [];
         this.tableData2 =
@@ -501,11 +543,18 @@ export default {
       padding-right: 5px;
     }
     display: flex;
+    .item {
+      width: 40px;
+    }
     .item1 {
       padding-left: 10px;
-      width: 15%;
+      width: 10%;
     }
     .item2 {
+      width: 18%;
+    }
+    .item3 {
+      padding-left: 12px;
       flex: 1;
     }
     .score-ipt {
@@ -539,7 +539,12 @@
     >
       <div class="head-box">
         <div class="tit">
-          <p class="txt">已考试卷信息</p>
+          <p class="txt">
+            已考试卷信息
+            <em class="red"
+              >(相同报表名称后的数字代表同一份试卷的考试次数，例如：模拟卷_1指模拟卷第1次考试成绩，模拟卷_2指模拟卷第2次考试成绩）</em
+            >
+          </p>
           <p>
             共筛选出{{ classTable.length }}个班级的已考试卷，<em class="red"
               >不同班级请选择同一份试卷进行对比</em
@@ -1104,7 +1109,7 @@ export default {
       this.loading = false;
       if (status === 0) {
         this.tableData =
-          data?.list.map((item) => {
+          data?.list?.map((item) => {
             item.loading = false;
             return item;
           }) || [];
@@ -1354,6 +1359,7 @@ div::-webkit-scrollbar-thumb {
   }
   .red {
     font-style: normal;
+    font-size: 12px;
     color: #f30;
   }
   .sel {