From ca6303207880530bcec16cb35f026bf3012c45e8 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Fri, 27 Oct 2023 15:19:01 +0800
Subject: [PATCH] 中天挑的问题

---
 src/views/standard/test/contrast.vue | 76 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue
index 5921159..3ca566e 100644
--- a/src/views/standard/test/contrast.vue
+++ b/src/views/standard/test/contrast.vue
@@ -17,11 +17,7 @@
             >{{ item }}</span
           >
         </div>
-        <el-button
-          class="setMinScore"
-          @click="diaLogBox = true"
-          round
-          size="small"
+        <el-button class="setMinScore" @click="openDia" round size="small"
           >对比成绩等级设置</el-button
         >
       </div>
@@ -149,7 +145,7 @@
         :close-on-click-modal="false"
         title="等级设置"
         :visible.sync="diaLogBox"
-        width="720px"
+        width="800px"
         @closed="closeDia"
       >
         <el-form class="use-form">
@@ -160,9 +156,9 @@
                 v-model="fromData.type"
                 @change="changeType"
               >
-                <el-option label="优良合格不合格" :value="1"></el-option>
-                <el-option label="ABCD" :value="2"></el-option>
-                <el-option label="自定义" :value="3"></el-option>
+                <el-option label="优良合格不合格" :value="0"></el-option>
+                <el-option label="ABCD" :value="1"></el-option>
+                <el-option label="自定义" :value="2"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="等级设置模式：" class="use-form-item">
@@ -200,17 +196,17 @@
                     type="number"
                     v-model="item[1]"
                     :min="item[2]"
-                    :max="
-                      index == 0 ? 100 : fromData.levels[index - 1][2] - 0.1
-                    "
+                    :max="index == 0 ? 100 : fromData.levels[index - 1][2]"
                     @keydown.native="keydownRange($event)"
                   ></el-input>
                   %
                   <template v-if="fromData.levelType == 0">
-                    ({{
+                    ({{ index != 0 ? "含" : ""
+                    }}{{
                       Number(((item[1] / 100) * examPaperScore).toFixed(1))
                     }}分)
                   </template>
+                  <template v-else>{{ index != 0 ? "含" : "" }}</template>
                 </p>
                 <p>~</p>
                 <p class="item3">
@@ -219,15 +215,19 @@
                     type="number"
                     v-model="item[2]"
                     :min="0"
-                    :max="item[1] - 1"
+                    :max="item[1]"
                     @keydown.native="keydownRange($event)"
                   ></el-input>
                   %
                   <template v-if="fromData.levelType == 0">
-                    ({{
+                    ({{ index < fromData.levels.length - 1 ? "不含" : ""
+                    }}{{
                       Number(((item[2] / 100) * examPaperScore).toFixed(1))
                     }}分)
                   </template>
+                  <template v-else>{{
+                    index < fromData.levels.length - 1 ? "不含" : ""
+                  }}</template>
                 </p>
                 <p class="item">
                   <el-link
@@ -276,7 +276,7 @@ export default {
       exportLoading: false,
       diaLogBox: false,
       fromData: {
-        type: 1,
+        type: 0,
         levelType: 0,
         levels: [
           ["优秀", 100, 90],
@@ -321,6 +321,9 @@ export default {
       this.tableMaxHeight = this.$refs.main.offsetHeight;
       this.type = type;
     },
+    openDia() {
+      this.diaLogBox = true;
+    },
     closeDia() {
       let levelFromData = sessionStorage.getItem("levelFromData");
       if (levelFromData) {
@@ -329,28 +332,31 @@ export default {
         this.fromData.levelType = levelFromData.levelType;
         this.fromData.levels = [...levelFromData.levels];
       } else {
-        this.fromData.type = 1;
+        this.fromData.type = 0;
         this.fromData.levelType = this.defaultLevels.levelType;
         this.fromData.levels = [...this.defaultLevels.levels];
       }
     },
     changeType(val) {
-      if (val == 1) {
+      if (val == this.defaultLevels.type) {
         this.fromData.levels = [...this.defaultLevels.levels];
-      } else if (val == 2) {
-        this.fromData.levels = [
-          ["A", 100, 90],
-          ["B", 89.9, 70],
-          ["C", 69.9, 60],
-          ["D", 59.9, 0],
-        ];
       } else {
-        this.fromData.levels = [
-          ["", 100, 90],
-          ["", 89.9, 70],
-          ["", 69.9, 60],
-          ["", 59.9, 0],
-        ];
+        this.fromData.levels = this.fromData.levels.splice(0, 4);
+        if (val == 0) {
+          this.fromData.levels = this.fromData.levels.map((item, index) => {
+            let arrTxt = ["优秀", "良好", "合格", "不合格"];
+            return [arrTxt[index], item[1], item[2]];
+          });
+        } else if (val == 1) {
+          this.fromData.levels = this.fromData.levels.map((item, index) => {
+            let arrTxt = ["A", "B", "C", "D"];
+            return [arrTxt[index], item[1], item[2]];
+          });
+        } else {
+          this.fromData.levels = this.fromData.levels.map((item, index) => {
+            return ["", item[1], item[2]];
+          });
+        }
       }
     },
     savefrom() {
@@ -373,7 +379,7 @@ export default {
       });
       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]) {
+        if (nums[i + 1] && nums[i + 1] > nums[i]) {
           ERR_OK = true;
           this.$message.warning("高等级比例不能低于低等级比例！请检查");
           break;
@@ -382,6 +388,7 @@ export default {
       if (ERR_OK) return;
       this.tableData = [];
       this.tableData2 = [];
+      this.defaultLevels.type = this.fromData.type;
       this.defaultLevels.levelType = this.fromData.levelType;
       this.defaultLevels.levels = [...this.fromData.levels];
       sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData));
@@ -396,6 +403,7 @@ export default {
       const { data, info, status } = await this.$request.defaultLevels();
       if (status === 0) {
         this.defaultLevels = { ...data } || {
+          type: 0,
           levelType: 0,
           levels: [
             ["优秀", 100, 90],
@@ -406,6 +414,10 @@ export default {
         };
         this.fromData.levelType = this.defaultLevels.levelType;
         this.fromData.levels = [...this.defaultLevels.levels];
+        sessionStorage.setItem(
+          "levelFromData",
+          JSON.stringify(this.defaultLevels)
+        );
       } else {
         this.$message.error(info);
       }
--
libgit2 0.21.4