修改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 <div
ref="chart" ref="chart"
id="chart" id="chart"
style="width: 600px; height: 600px; margin: 0 auto" style="width: 1000px; height: 600px; margin: 0 auto"
></div> ></div>
</div> </div>
</el-col> </el-col>

View File

@ -1113,13 +1113,12 @@
title="查看个人成绩" title="查看个人成绩"
:visible.sync="innerVisible5" :visible.sync="innerVisible5"
append-to-body append-to-body
style="margin-top: 5%"
width="1000px" width="1000px"
> >
<el-table <el-table
ref="singleTable" ref="singleTable"
:data="getAllTestItemScore" :data="getAllTestItemScore"
style="width: 95%; margin: 20px auto" style="width: 95%; "
> >
<el-table-column <el-table-column
property="itemCode" property="itemCode"
@ -1159,25 +1158,14 @@
width="180" width="180"
align="center" align="center"
> >
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<el-input {{
readonly scope.row.itemScore != null ||
type="number" scope.row.scoreDictId == ResultType1.dictCode
v-model="scope.row.itemScore" ? scope.row.itemScore
v-if=" : scope.row.scoreDictValue
scope.row.itemScore != null || }}
scope.row.scoreDictId == ResultType1.dictCode </template>
"
></el-input>
<el-input
readonly
v-model="scope.row.scoreDictValue"
v-if="
scope.row.scoreDictValue != null ||
scope.row.scoreDictId == ResultType2.dictCode
"
></el-input>
</template> -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="itemFraction" property="itemFraction"

View File

@ -699,35 +699,35 @@ export default {
} }
}; };
let itemLevelList = (rule, value, callback) => { let itemLevelList = (rule, value, callback) => {
let min = value.map((e) => { for (let i = 0; i < value.length; i++) {
return e.levelMinScore; console.log(value[i].levelMinScore > value[i].levelMaxScore);
}); if (value[i].levelMinScore > value[i].levelMaxScore) {
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]) {
callback(new Error("最高分必须大于最低分,请重新填写!")); callback(new Error("最高分必须大于最低分,请重新填写!"));
} else { } else if (value[i].levelName == "") {
console.log(min, max);
}
if (
value.map((e) => {
return e.levelName;
})[i] == ""
) {
callback(); callback();
} else if (min[i] == "") { } else if (value[i].levelMinScore == "") {
callback(); callback();
} else if (max[i] == "") { } else if (value[i].levelMaxScore == "") {
callback(); callback();
} else { } else {
callback(); 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) => { let minScore = (rule, value, callback) => {

View File

@ -249,13 +249,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <!-- <pagination
v-show="total2 > 0" v-show="total2 > 0"
:total="total2" :total="total2"
:page.sync="temqueryParams.pageNum" :page.sync="temqueryParams.pageNum"
:limit.sync="temqueryParams.pageSize" :limit.sync="temqueryParams.pageSize"
@pagination="lookitem" @pagination="lookitem"
/> /> -->
</div> </div>
</el-dialog> </el-dialog>
@ -301,14 +301,12 @@
<el-button <el-button
type="primary" type="primary"
style="width: 20px; height: 20px; padding: 0px" style="width: 20px; height: 20px; padding: 0px"
v-if="items.find((e) => e.itemId == scope.row.id)" v-if="items.find((e) => e.itemId == scope.row.id)"
@click="deltestitem(scope.row)" @click="deltestitem(scope.row)"
></el-button> ></el-button>
<el-button <el-button
v-else v-else
style="width: 20px; height: 20px; padding: 0px" style="width: 20px; height: 20px; padding: 0px"
@click="addtestitem(scope.row)" @click="addtestitem(scope.row)"
></el-button> ></el-button>
</template> </template>
@ -455,7 +453,6 @@
title="查看测试项目" title="查看测试项目"
:visible.sync="innerVisible" :visible.sync="innerVisible"
append-to-body append-to-body
style="margin-top: 100px"
> >
<el-table ref="singleTable" :data="itemlist" style="width: 100%"> <el-table ref="singleTable" :data="itemlist" style="width: 100%">
<el-table-column type="index" width="100" align="center"> <el-table-column type="index" width="100" align="center">
@ -493,13 +490,13 @@
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <!-- <pagination
v-show="total2 > 0" v-show="total2 > 0"
:total="total2" :total="total2"
:page.sync="temqueryParams.pageNum" :page.sync="temqueryParams.pageNum"
:limit.sync="temqueryParams.pageSize" :limit.sync="temqueryParams.pageSize"
@pagination="lookitem" @pagination="lookitem"
/> /> -->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -563,7 +560,7 @@ export default {
}, },
temqueryParams: { temqueryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 9999,
id: "", id: "",
}, },
// //