From f3fc111fc48ef35bee846d3ec74df8b08edee711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 19 Sep 2022 11:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/physique/index.vue       |  2 +-
 src/views/system/testItemScore/index.vue  | 30 +++++-----------
 src/views/system/testItems/index.vue      | 42 +++++++++++------------
 src/views/system/testScoreBatch/index.vue | 13 +++----
 4 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index 4552c5a..67e5158 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -109,7 +109,7 @@
           <div
             ref="chart"
             id="chart"
-            style="width: 600px; height: 600px; margin: 0 auto"
+            style="width: 1000px; height: 600px; margin: 0 auto"
           ></div>
         </div>
       </el-col>
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index f630dea..3ee51d3 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -1113,13 +1113,12 @@
       title="查看个人成绩"
       :visible.sync="innerVisible5"
       append-to-body
-      style="margin-top: 5%"
       width="1000px"
     >
       <el-table
         ref="singleTable"
         :data="getAllTestItemScore"
-        style="width: 95%; margin: 20px auto"
+        style="width: 95%; "
       >
         <el-table-column
           property="itemCode"
@@ -1159,25 +1158,14 @@
           width="180"
           align="center"
         >
-          <!-- <template slot-scope="scope">
-            <el-input
-            readonly
-              type="number"
-              v-model="scope.row.itemScore"
-              v-if="
-                scope.row.itemScore != null ||
-                scope.row.scoreDictId == ResultType1.dictCode
-              "
-            ></el-input>
-            <el-input
-            readonly
-              v-model="scope.row.scoreDictValue"
-              v-if="
-                scope.row.scoreDictValue != null ||
-                scope.row.scoreDictId == ResultType2.dictCode
-              "
-            ></el-input>
-          </template> -->
+          <template slot-scope="scope">
+            {{
+              scope.row.itemScore != null ||
+              scope.row.scoreDictId == ResultType1.dictCode
+                ? scope.row.itemScore
+                : scope.row.scoreDictValue
+            }}
+          </template>
         </el-table-column>
         <el-table-column
           property="itemFraction"
diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue
index a7ec2af..e5a7940 100644
--- a/src/views/system/testItems/index.vue
+++ b/src/views/system/testItems/index.vue
@@ -699,35 +699,35 @@ export default {
       }
     };
     let itemLevelList = (rule, value, callback) => {
-      let min = value.map((e) => {
-        return e.levelMinScore;
-      });
-      let max = value.map((e) => {
-        return e.levelMaxScore;
-      });
-      console.log(value.length);
-
-      for (var i = 0; i < value.length; i++) {
-        console.log(min[i], max[i]);
-        if (max[i] < min[i]) {
+      for (let i = 0; i < value.length; i++) {
+        console.log(value[i].levelMinScore > value[i].levelMaxScore);
+        if (value[i].levelMinScore > value[i].levelMaxScore) {
           callback(new Error("最高分必须大于最低分,请重新填写！"));
-        } else {
-          console.log(min, max);
-        }
-        if (
-          value.map((e) => {
-            return e.levelName;
-          })[i] == ""
-        ) {
+        } else if (value[i].levelName == "") {
           callback();
-        } else if (min[i] == "") {
+        } else if (value[i].levelMinScore == "") {
           callback();
-        } else if (max[i] == "") {
+        } else if (value[i].levelMaxScore == "") {
           callback();
         } else {
           callback();
         }
       }
+      // value.for((e) => {
+      //   console.log(e.levelMinScore, e.levelMaxScore);
+      //   console.log(e.levelMinScore > e.levelMaxScore);
+      //   if (e.levelMinScore > e.levelMaxScore) {
+      //     callback(new Error("最高分必须大于最低分,请重新填写！"));
+      //   } else if (e.levelName == "") {
+      //     callback();
+      //   } else if (e.levelMinScore == "") {
+      //     callback();
+      //   } else if (e.levelMaxScore == "") {
+      //     callback();
+      //   } else {
+      //     callback();
+      //   }
+      // });
     };
 
     let minScore = (rule, value, callback) => {
diff --git a/src/views/system/testScoreBatch/index.vue b/src/views/system/testScoreBatch/index.vue
index 3d78da0..1e6bf9c 100644
--- a/src/views/system/testScoreBatch/index.vue
+++ b/src/views/system/testScoreBatch/index.vue
@@ -249,13 +249,13 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
           v-show="total2 > 0"
           :total="total2"
           :page.sync="temqueryParams.pageNum"
           :limit.sync="temqueryParams.pageSize"
           @pagination="lookitem"
-        />
+        /> -->
       </div>
     </el-dialog>
 
@@ -301,14 +301,12 @@
             <el-button
               type="primary"
               style="width: 20px; height: 20px; padding: 0px"
-
               v-if="items.find((e) => e.itemId == scope.row.id)"
               @click="deltestitem(scope.row)"
             ></el-button>
             <el-button
               v-else
               style="width: 20px; height: 20px; padding: 0px"
-
               @click="addtestitem(scope.row)"
             ></el-button>
           </template>
@@ -455,7 +453,6 @@
       title="查看测试项目"
       :visible.sync="innerVisible"
       append-to-body
-      style="margin-top: 100px"
     >
       <el-table ref="singleTable" :data="itemlist" style="width: 100%">
         <el-table-column type="index" width="100" align="center">
@@ -493,13 +490,13 @@
           >
         </el-table-column>
       </el-table>
-      <pagination
+      <!-- <pagination
         v-show="total2 > 0"
         :total="total2"
         :page.sync="temqueryParams.pageNum"
         :limit.sync="temqueryParams.pageSize"
         @pagination="lookitem"
-      />
+      /> -->
     </el-dialog>
   </div>
 </template>
@@ -563,7 +560,7 @@ export default {
       },
       temqueryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 9999,
         id: "",
       },
       // 测试项目