From 6b3dde63f208122d9499d80c6f57662642e8df9a Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 14 Mar 2024 15:14:57 +0800
Subject: [PATCH] 随堂问，即时测没有数据显示-,其他交互优化

---
 src/views/basic/ask/components/answerQustion.vue    | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 src/views/basic/ask/components/detail.vue           |   4 ++--
 src/views/basic/ask/components/interact.vue         | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 src/views/basic/test/components/multipleSubTest.vue |  36 ++++++++++++++++++++++++++++++++----
 src/views/basic/test/components/multipleTest.vue    |  18 ++++++++++++++++--
 5 files changed, 246 insertions(+), 69 deletions(-)

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"
-        ></el-table-column>
+        >
+          <template slot-scope="scoped">{{
+            scoped.row.correctAnswerTimes ||
+            Number(scoped.row.correctAnswerTimes) === 0
+              ? scoped.row.correctAnswerTimes
+              : "-"
+          }}</template>
+        </el-table-column>
         <el-table-column
           prop="participationRate"
           label="参与度"
           sortable
           align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.participationRate}${
-              scoped.row.participationRate ? "%" : ""
-            }`
+            scoped.row.participationRate ||
+            Number(scoped.row.participationRate) === 0
+              ? scoped.row.participationRate + "%"
+              : "-"
           }}</template></el-table-column
         >
         <el-table-column
@@ -47,7 +55,9 @@
           sortable
           align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.correctRate}${scoped.row.correctRate ? "%" : ""}`
+            scoped.row.correctRate || Number(scoped.row.correctRate) === 0
+              ? scoped.row.correctRate + "%"
+              : "-"
           }}</template></el-table-column
         >
         <el-table-column
@@ -56,9 +66,10 @@
           sortable
           align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.answerCorrectRate}${
-              scoped.row.answerCorrectRate ? "%" : ""
-            }`
+            scoped.row.answerCorrectRate ||
+            Number(scoped.row.answerCorrectRate) === 0
+              ? scoped.row.answerCorrectRate + "%"
+              : "-"
           }}</template></el-table-column
         >
         <el-table-column
@@ -68,33 +79,41 @@
           align="center"
           ><template slot-scope="scoped">
             <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
-              scoped.row["answer" + index]
+              scoped.row["answer" + index] || "-"
             }}</span>
           </template>
         </el-table-column>
       </template>
       <template v-if="types == 2">
-        <el-table-column
-          prop="answerTimes"
-          label="累计答题次数"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="answerTimes" label="累计答题次数" align="center">
+          <template slot-scope="scoped">{{
+            scoped.row.answerTimes || Number(scoped.row.answerTimes) === 0
+              ? scoped.row.answerTimes
+              : "-"
+          }}</template>
+        </el-table-column>
         <el-table-column
           prop="correctAnswerTimes"
           label="累计答对次数"
           align="center"
-        ></el-table-column>
+          ><template slot-scope="scoped">{{
+            scoped.row.correctAnswerTimes ||
+            Number(scoped.row.correctAnswerTimes) === 0
+              ? scoped.row.correctAnswerTimes
+              : "-"
+          }}</template></el-table-column
+        >
         <el-table-column
           prop="participationRate"
           label="总参与度"
           align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.participationRate}${
-              scoped.row.participationRate ? "%" : ""
-            }`
-          }}</template></el-table-column
-        >
-
+            scoped.row.participationRate ||
+            Number(scoped.row.participationRate) === 0
+              ? scoped.row.participationRate + "%"
+              : "-"
+          }}</template>
+        </el-table-column>
         <el-table-column
           prop="participationRateRank"
           label="总参与度班名"
@@ -102,7 +121,9 @@
         ></el-table-column>
         <el-table-column prop="correctRate" label="总正确率" align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.correctRate}${scoped.row.correctRate ? "%" : ""}`
+            scoped.row.correctRate || Number(scoped.row.correctRate) === 0
+              ? scoped.row.correctRate + "%"
+              : "-"
           }}</template></el-table-column
         >
         <el-table-column
@@ -110,15 +131,23 @@
           label="总正确率班名"
           sortable
           align="center"
-        ></el-table-column>
+        >
+          <template slot-scope="scoped">{{
+            scoped.row.correctRateRank ||
+            Number(scoped.row.correctRateRank) === 0
+              ? scoped.row.correctRateRank
+              : "-"
+          }}</template>
+        </el-table-column>
         <el-table-column
           prop="answerCorrectRate"
           label="已答正确率"
           align="center"
           ><template slot-scope="scoped">{{
-            `${scoped.row.answerCorrectRate}${
-              scoped.row.answerCorrectRate ? "%" : ""
-            }`
+            scoped.row.answerCorrectRate ||
+            Number(scoped.row.answerCorrectRate) === 0
+              ? scoped.row.answerCorrectRate + "%"
+              : "-"
           }}</template></el-table-column
         >
         <el-table-column label="查看折线图" align="center">
@@ -145,38 +174,56 @@
             :label="index == 0 ? '总课时数' : '课时数'"
             :prop="'periodCount' + item"
           >
+            <template slot-scope="scoped">{{
+              scoped.row["periodCount" + item] ||
+              Number(scoped.row["periodCount" + item]) === 0
+                ? scoped.row["periodCount" + item]
+                : "-"
+            }}</template>
           </el-table-column>
           <el-table-column
             align="center"
             :label="index == 0 ? '总出题数' : '出题数'"
             :prop="'questionNum' + item"
           >
+            <template slot-scope="scoped">{{
+              scoped.row["questionNum" + item] ||
+              Number(scoped.row["questionNum" + item]) === 0
+                ? scoped.row["questionNum" + item]
+                : "-"
+            }}</template>
           </el-table-column>
           <el-table-column
             align="center"
             :label="index == 0 ? '总参与度' : '参与度'"
             :prop="'participationRate' + item"
-            ><template slot-scope="scoped"
-              >{{
-                `${
-                  scoped.row["participationRate" + item]
-                    ? scoped.row["participationRate" + item] + "%"
-                    : ""
-                }
-              `
-              }}{{
+            ><template slot-scope="scoped">{{
+              scoped.row["participationRate" + item] ||
+              Number(scoped.row["participationRate" + item]) === 0
+                ? scoped.row["participationRate" + item] + "%"
+                : "-"
             }}</template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             :label="index == 0 ? '总正确率' : '正确率'"
             :prop="'correctRate' + item"
             ><template slot-scope="scoped">{{
-              `${
-                scoped.row["correctRate" + item]
-                  ? scoped.row["correctRate" + item] + "%"
-                  : ""
-              }`
+              scoped.row["correctRate" + item] ||
+              Number(scoped.row["correctRate" + item]) === 0
+                ? scoped.row["correctRate" + item] + "%"
+                : "-"
+            }}</template>
+          </el-table-column> -->
+          <el-table-column
+            align="center"
+            :label="index == 0 ? '总正确率' : '正确率'"
+            :prop="'answerCorrectRate' + item"
+            ><template slot-scope="scoped">{{
+              scoped.row["answerCorrectRate" + item] ||
+              Number(scoped.row["answerCorrectRate" + item]) === 0
+                ? scoped.row["answerCorrectRate" + item] + "%"
+                : "-"
             }}</template>
           </el-table-column>
         </el-table-column>
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 @@
     <li class="info-item">题目总数：{{ detail.questionNum }}</li>
     <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
     <li class="info-item">课时时长：{{ detail.duration }}</li>
-    <li class="info-item">总参与度：：{{ detail.participationRate }}%</li>
+    <li class="info-item">总参与度：{{ detail.participationRate }}%</li>
     <li class="info-item">班级总正确率：{{ detail.classCorrectRate }}%</li>
     <li class="info-item">已答总正确率：{{ detail.answerCorrectRate }}%</li>
     <li class="info-item">
@@ -21,7 +21,7 @@
       课时名称：{{ detail.title }}
     </li>
     <li class="info-item" v-else>课时总数：{{ id.length }}</li>
-    <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
+    <li class="info-item">课时时长：{{ detail.duration }}</li>
     <li class="info-item">
       反馈时长：{{ setDuration(detail.consumingDuration) }}
     </li>
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 @@
 <template>
   <el-table :data="resultData" border style="width: 100%">
-    <el-table-column prop="studentCode" label="学号" align="center"></el-table-column>
-    <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
+    <el-table-column
+      prop="studentCode"
+      label="学号"
+      align="center"
+    ></el-table-column>
+    <el-table-column
+      prop="studentName"
+      label="姓名"
+      align="center"
+    ></el-table-column>
     <template v-if="types != 3">
-      <el-table-column prop="rushAnswerTimes" label="抢答成功次数" sortable align="center"></el-table-column>
-      <el-table-column prop="rushAnswerCorrectTimes" label="答对次数" sortable align="center"></el-table-column>
-      <el-table-column prop="checkAnswerTimes" label="抽答次数" sortable align="center"></el-table-column>
-      <el-table-column prop="checkAnswerCorrectTimes" label="抽答答对次数" sortable align="center"></el-table-column>
-      <el-table-column prop="interactionsNum" label="参与得分" sortable align="center"></el-table-column>
-      <el-table-column prop="interactionsCorrectNum" label="对错得分" sortable align="center"></el-table-column>
+      <el-table-column
+        prop="rushAnswerTimes"
+        label="抢答成功次数"
+        sortable
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="rushAnswerCorrectTimes"
+        label="答对次数"
+        sortable
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="checkAnswerTimes"
+        label="抽答次数"
+        sortable
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="checkAnswerCorrectTimes"
+        label="抽答答对次数"
+        sortable
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="interactionsNum"
+        label="参与得分"
+        sortable
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="interactionsCorrectNum"
+        label="对错得分"
+        sortable
+        align="center"
+      ></el-table-column>
     </template>
     <template v-else>
-      <el-table-column v-for="(item, index) in phaseInter" :key="index" :label="item" align="center">
-        <el-table-column align="center" v-if="index == 0" label="参与分" sortable :prop="'interactionsNum' + item">
+      <el-table-column
+        v-for="(item, index) in phaseInter"
+        :key="index"
+        :label="item"
+        align="center"
+      >
+        <el-table-column
+          align="center"
+          v-if="index == 0"
+          label="参与分"
+          sortable
+          :prop="'interactionsNum' + item"
+        >
+          <template slot-scope="scoped">{{
+            scoped.row["interactionsNum" + item] ||
+            Number(scoped.row["interactionsNum" + item]) === 0
+              ? scoped.row["interactionsNum" + item]
+              : "-"
+          }}</template>
         </el-table-column>
-        <el-table-column v-else align="center" label="互动数" :prop="'interactionsNum' + item">
+        <el-table-column
+          v-else
+          align="center"
+          label="互动数"
+          :prop="'interactionsNum' + item"
+        >
+          <template slot-scope="scoped">{{
+            scoped.row["interactionsNum" + item] ||
+            Number(scoped.row["interactionsNum" + item]) === 0
+              ? scoped.row["interactionsNum" + item]
+              : "-"
+          }}</template>
         </el-table-column>
-        <el-table-column v-if="index == 0" align="center" label="对错分" sortable :prop="'interactionsCorrectNum' + item">
+        <el-table-column
+          v-if="index == 0"
+          align="center"
+          label="对错分"
+          sortable
+          :prop="'interactionsCorrectNum' + item"
+        >
+          <template slot-scope="scoped">{{
+            scoped.row["interactionsCorrectNum" + item] ||
+            Number(scoped.row["interactionsCorrectNum" + item]) === 0
+              ? scoped.row["interactionsCorrectNum" + item]
+              : "-"
+          }}</template>
         </el-table-column>
-        <el-table-column v-else align="center" label="参与数" :prop="'interactionsCorrectNum' + item">
+        <el-table-column
+          v-else
+          align="center"
+          label="参与数"
+          :prop="'interactionsCorrectNum' + item"
+        >
+          <template slot-scope="scoped">{{
+            scoped.row["interactionsCorrectNum" + item] ||
+            Number(scoped.row["interactionsCorrectNum" + item]) === 0
+              ? scoped.row["interactionsCorrectNum" + item]
+              : "-"
+          }}</template>
         </el-table-column>
       </el-table-column>
     </template>
@@ -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;
+    },
   },
 };
 </script>
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' : ''"
-          ></el-table-column>
+          >
+            <template slot-scope="scoped">{{
+              scoped.row["examCount" + item] ||
+              Number(scoped.row["examCount" + item]) === 0
+                ? scoped.row["examCount" + item]
+                : "-"
+            }}</template>
+          </el-table-column>
           <el-table-column
             :prop="'participationCount' + item"
             label="参与数"
             align="center"
             :class-name="index % 2 == 0 ? 'bg' : ''"
-          ></el-table-column>
+          >
+            <template slot-scope="scoped">{{
+              scoped.row["participationCount" + item] ||
+              Number(scoped.row["participationCount" + item]) === 0
+                ? scoped.row["participationCount" + item]
+                : "-"
+            }}</template>
+          </el-table-column>
           <el-table-column
             :prop="'score' + item"
             label="总分"
             align="center"
             :class-name="index % 2 == 0 ? 'bg' : ''"
-          ></el-table-column>
+          >
+            <template slot-scope="scoped">{{
+              scoped.row["score" + item] ||
+              Number(scoped.row["score" + item]) === 0
+                ? scoped.row["score" + item]
+                : "-"
+            }}</template>
+          </el-table-column>
           <el-table-column
             :prop="'classRank' + item"
             label="班名"
             align="center"
             :class-name="index % 2 == 0 ? 'bg' : ''"
-          ></el-table-column>
+          >
+            <template slot-scope="scoped">{{
+              scoped.row["classRank" + item] ||
+              Number(scoped.row["classRank" + item]) === 0
+                ? scoped.row["classRank" + item]
+                : "-"
+            }}</template>
+          </el-table-column>
         </el-table-column>
         <el-table-column label="查看雷达图" align="center">
           <template slot-scope="scoped">
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' : ''"
-          ></el-table-column>
+          >
+            <template slot-scope="scoped">{{
+              scoped.row["score" + index] ||
+              Number(scoped.row["score" + index]) === 0
+                ? scoped.row["score" + index]
+                : "-"
+            }}</template>
+          </el-table-column>
           <el-table-column
             :prop="'classRank' + index"
             label="班名"
             align="center"
             sortable
             :class-name="index % 2 == 0 ? 'bg' : ''"
-          ></el-table-column>
+          >
+            <template slot-scope="scoped">{{
+              scoped.row["classRank" + index] ||
+              Number(scoped.row["classRank" + index]) === 0
+                ? scoped.row["classRank" + index]
+                : "-"
+            }}</template>
+          </el-table-column>
         </el-table-column>
         <el-table-column label="查看折线图" align="center">
           <template slot-scope="scoped">
--
libgit2 0.21.4