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 @@
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"
>
-
+
+ {{
+ scope.row.itemScore != null ||
+ scope.row.scoreDictId == ResultType1.dictCode
+ ? scope.row.itemScore
+ : scope.row.scoreDictValue
+ }}
+
{
- 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 @@
-
+ /> -->
@@ -301,14 +301,12 @@
@@ -455,7 +453,6 @@
title="查看测试项目"
:visible.sync="innerVisible"
append-to-body
- style="margin-top: 100px"
>
@@ -493,13 +490,13 @@
>
-
+ /> -->
@@ -563,7 +560,7 @@ export default {
},
temqueryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 9999,
id: "",
},
// 测试项目