From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/trainExam/performance.vue | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 6ef70be..ca37c96 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -30,11 +30,11 @@
@refresh-change="refreshChange">
<template slot-scope="{ row }"
slot="theoryGrade">
- {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+ {{ row.theoryGrade }}
</template>
<template slot-scope="{ row }"
slot="learnGrade">
- {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ {{ row.learnGrade == '' ? "暂未录入" : row.learnGrade }}
</template>
<template slot-scope="{ row }"
slot="allGrade">
@@ -43,7 +43,7 @@
<template slot-scope="{ row }"
slot="qualified">
{{
- row.qualified == -1
+ row.qualified == ''
? ""
: row.qualified == 0
? "合格"
@@ -631,14 +631,7 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 58,
- rules: [
- {
- required: true,
- message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ width: 58
},
{
label: "是否合格",
@@ -677,14 +670,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
- rules: [
- {
- required: true,
- message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ editDetail: false
},
],
},
@@ -812,7 +798,16 @@
page.pageSize,
Object.assign(params, this.questionBankQuery)
).then((res) => {
+
const data = res.data.data;
+
+ data.records.forEach(item => {
+ if (item.theoryGrade == null && item.learnGrade == -1) {
+ item.qualified = ''
+ }
+ item.theoryGrade == null ? item.theoryGrade = '' : item.theoryGrade
+ item.learnGrade == -1 ? item.learnGrade = '' : item.learnGrade
+ })
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
--
Gitblit v1.9.3