diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue
index 214568f..aff922e 100644
--- a/src/views/basic/ask/components/answerQustion.vue
+++ b/src/views/basic/ask/components/answerQustion.vue
@@ -29,16 +29,24 @@
prop="correctAnswerTimes"
label="答对次数"
align="center"
- >
+ >
+ {{
+ scoped.row.correctAnswerTimes ||
+ Number(scoped.row.correctAnswerTimes) === 0
+ ? scoped.row.correctAnswerTimes
+ : "-"
+ }}
+
{{
- `${scoped.row.participationRate}${
- scoped.row.participationRate ? "%" : ""
- }`
+ scoped.row.participationRate ||
+ Number(scoped.row.participationRate) === 0
+ ? scoped.row.participationRate + "%"
+ : "-"
}}
{{
- `${scoped.row.correctRate}${scoped.row.correctRate ? "%" : ""}`
+ scoped.row.correctRate || Number(scoped.row.correctRate) === 0
+ ? scoped.row.correctRate + "%"
+ : "-"
}}
{{
- `${scoped.row.answerCorrectRate}${
- scoped.row.answerCorrectRate ? "%" : ""
- }`
+ scoped.row.answerCorrectRate ||
+ Number(scoped.row.answerCorrectRate) === 0
+ ? scoped.row.answerCorrectRate + "%"
+ : "-"
}}
{{
- scoped.row["answer" + index]
+ scoped.row["answer" + index] || "-"
}}
-
+
+ {{
+ scoped.row.answerTimes || Number(scoped.row.answerTimes) === 0
+ ? scoped.row.answerTimes
+ : "-"
+ }}
+
+ >{{
+ scoped.row.correctAnswerTimes ||
+ Number(scoped.row.correctAnswerTimes) === 0
+ ? scoped.row.correctAnswerTimes
+ : "-"
+ }}
{{
- `${scoped.row.participationRate}${
- scoped.row.participationRate ? "%" : ""
- }`
- }}
-
+ scoped.row.participationRate ||
+ Number(scoped.row.participationRate) === 0
+ ? scoped.row.participationRate + "%"
+ : "-"
+ }}
+
{{
- `${scoped.row.correctRate}${scoped.row.correctRate ? "%" : ""}`
+ scoped.row.correctRate || Number(scoped.row.correctRate) === 0
+ ? scoped.row.correctRate + "%"
+ : "-"
}}
+ >
+ {{
+ scoped.row.correctRateRank ||
+ Number(scoped.row.correctRateRank) === 0
+ ? scoped.row.correctRateRank
+ : "-"
+ }}
+
{{
- `${scoped.row.answerCorrectRate}${
- scoped.row.answerCorrectRate ? "%" : ""
- }`
+ scoped.row.answerCorrectRate ||
+ Number(scoped.row.answerCorrectRate) === 0
+ ? scoped.row.answerCorrectRate + "%"
+ : "-"
}}
@@ -145,38 +174,56 @@
:label="index == 0 ? '总课时数' : '课时数'"
:prop="'periodCount' + item"
>
+ {{
+ scoped.row["periodCount" + item] ||
+ Number(scoped.row["periodCount" + item]) === 0
+ ? scoped.row["periodCount" + item]
+ : "-"
+ }}
+ {{
+ scoped.row["questionNum" + item] ||
+ Number(scoped.row["questionNum" + item]) === 0
+ ? scoped.row["questionNum" + item]
+ : "-"
+ }}
{{
- `${
- scoped.row["participationRate" + item]
- ? scoped.row["participationRate" + item] + "%"
- : ""
- }
- `
- }}{{
+ >{{
+ scoped.row["participationRate" + item] ||
+ Number(scoped.row["participationRate" + item]) === 0
+ ? scoped.row["participationRate" + item] + "%"
+ : "-"
}}
- {{
- `${
- scoped.row["correctRate" + item]
- ? scoped.row["correctRate" + item] + "%"
- : ""
- }`
+ scoped.row["correctRate" + item] ||
+ Number(scoped.row["correctRate" + item]) === 0
+ ? scoped.row["correctRate" + item] + "%"
+ : "-"
+ }}
+ -->
+ {{
+ scoped.row["answerCorrectRate" + item] ||
+ Number(scoped.row["answerCorrectRate" + item]) === 0
+ ? scoped.row["answerCorrectRate" + item] + "%"
+ : "-"
}}
diff --git a/src/views/basic/ask/components/detail.vue b/src/views/basic/ask/components/detail.vue
index a9eab45..a484094 100644
--- a/src/views/basic/ask/components/detail.vue
+++ b/src/views/basic/ask/components/detail.vue
@@ -8,7 +8,7 @@
题目总数:{{ detail.questionNum }}
答题总数:{{ detail.totalAnswersNum }}
课时时长:{{ detail.duration }}
- 总参与度::{{ detail.participationRate }}%
+ 总参与度:{{ detail.participationRate }}%
班级总正确率:{{ detail.classCorrectRate }}%
已答总正确率:{{ detail.answerCorrectRate }}%
@@ -21,7 +21,7 @@
课时名称:{{ detail.title }}
课时总数:{{ id.length }}
- 课时时长:{{ detail.duration }}分钟
+ 课时时长:{{ detail.duration }}
反馈时长:{{ setDuration(detail.consumingDuration) }}
diff --git a/src/views/basic/ask/components/interact.vue b/src/views/basic/ask/components/interact.vue
index 40a8a30..03dd8fb 100644
--- a/src/views/basic/ask/components/interact.vue
+++ b/src/views/basic/ask/components/interact.vue
@@ -1,24 +1,113 @@
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+ {{
+ scoped.row["interactionsNum" + item] ||
+ Number(scoped.row["interactionsNum" + item]) === 0
+ ? scoped.row["interactionsNum" + item]
+ : "-"
+ }}
-
+
+ {{
+ scoped.row["interactionsNum" + item] ||
+ Number(scoped.row["interactionsNum" + item]) === 0
+ ? scoped.row["interactionsNum" + item]
+ : "-"
+ }}
-
+
+ {{
+ scoped.row["interactionsCorrectNum" + item] ||
+ Number(scoped.row["interactionsCorrectNum" + item]) === 0
+ ? scoped.row["interactionsCorrectNum" + item]
+ : "-"
+ }}
-
+
+ {{
+ scoped.row["interactionsCorrectNum" + item] ||
+ Number(scoped.row["interactionsCorrectNum" + item]) === 0
+ ? scoped.row["interactionsCorrectNum" + item]
+ : "-"
+ }}
@@ -33,13 +122,12 @@ export default {
data() {
return {
phaseInter: [], //互动补充数据
- }
+ };
},
computed: {
resultData: function () {
- let resultData = []
+ let resultData = [];
if (this.tableData.length) {
-
let subjectName = [];
resultData = this.tableData?.map((item) => {
let params = {};
@@ -59,11 +147,11 @@ export default {
});
this.phaseInter = [...subjectName];
} else {
- resultData = []
- this.optionsList = []
+ resultData = [];
+ this.optionsList = [];
}
- return resultData
- }
+ return resultData;
+ },
},
};
diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue
index 0916c04..df13be1 100644
--- a/src/views/basic/test/components/multipleSubTest.vue
+++ b/src/views/basic/test/components/multipleSubTest.vue
@@ -33,25 +33,53 @@
label="测练数"
align="center"
:class-name="index % 2 == 0 ? 'bg' : ''"
- >
+ >
+ {{
+ scoped.row["examCount" + item] ||
+ Number(scoped.row["examCount" + item]) === 0
+ ? scoped.row["examCount" + item]
+ : "-"
+ }}
+
+ >
+ {{
+ scoped.row["participationCount" + item] ||
+ Number(scoped.row["participationCount" + item]) === 0
+ ? scoped.row["participationCount" + item]
+ : "-"
+ }}
+
+ >
+ {{
+ scoped.row["score" + item] ||
+ Number(scoped.row["score" + item]) === 0
+ ? scoped.row["score" + item]
+ : "-"
+ }}
+
+ >
+ {{
+ scoped.row["classRank" + item] ||
+ Number(scoped.row["classRank" + item]) === 0
+ ? scoped.row["classRank" + item]
+ : "-"
+ }}
+
diff --git a/src/views/basic/test/components/multipleTest.vue b/src/views/basic/test/components/multipleTest.vue
index 873288e..6959c32 100644
--- a/src/views/basic/test/components/multipleTest.vue
+++ b/src/views/basic/test/components/multipleTest.vue
@@ -29,14 +29,28 @@
:label="index == 0 ? '总分' : '成绩'"
align="center"
:class-name="index % 2 == 0 ? 'bg' : ''"
- >
+ >
+ {{
+ scoped.row["score" + index] ||
+ Number(scoped.row["score" + index]) === 0
+ ? scoped.row["score" + index]
+ : "-"
+ }}
+
+ >
+ {{
+ scoped.row["classRank" + index] ||
+ Number(scoped.row["classRank" + index]) === 0
+ ? scoped.row["classRank" + index]
+ : "-"
+ }}
+