修改bug

This commit is contained in:
曹辉 2022-09-19 11:54:04 +08:00
parent e40dd3b593
commit f3fc111fc4
4 changed files with 36 additions and 51 deletions

View File

@ -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>

View File

@ -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"

View File

@ -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) => {

View File

@ -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: "",
},
//