Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

src/components/study.vue

@@ -1125,22 +1125,38 @@
                         </div>
                       </div>
                     </div>
-                    <div
-                      v-if="
-                        worksStudent[jdIndex] &&
-                        worksStudent[jdIndex][rwIndex] &&
-                        tType &&
-                        tType == 3 &&
-                        tool.tool.indexOf(4) != -1
-                      "
-                      class="worksBox"
-                    >
-                      <div
-                        style="padding-top: 15px; font-size: 18px"
-                        v-if="
-                          worksStudent[jdIndex][rwIndex][toolIndex].length > 0
-                        "
-                      >
+                    <div v-if="
+                       worksStudent[jdIndex] &&
+                      worksStudent[jdIndex][rwIndex] &&
+                      tType &&
+                      tType == 3 &&
+                      tool.tool.indexOf(4) != -1 && (tool.askJson[0].answer || tool.askJson[0].answer === 0)
+                    " class="xuan_right_box">
+                      <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
+                        <div>
+                          <span>{{ index + 1 + "、" + item.askstitle }}</span>
+                        </div>
+                        <div class="right_box_xuan" v-for="(item1, checkIndex) in item.askItem" :key="checkIndex"
+                          v-if=" item.answer == checkIndex">
+                          <span>正确率</span>
+                          <span>{{
+                          (checkJson[jdIndex][rwIndex][toolIndex][index].checkPerent[checkIndex]
+                          ? checkJson[jdIndex][rwIndex][toolIndex][index].checkPerent[checkIndex]
+                          : 0) +'%'
+                          }}</span>
+                        </div>
+                      </div>
+                    </div>
+                    <div v-if="
+                      worksStudent[jdIndex] &&
+                      worksStudent[jdIndex][rwIndex] &&
+                      tType &&
+                      tType == 3 &&
+                      tool.tool.indexOf(4) != -1
+                    " class="worksBox">
+                      <div style="padding-top: 15px; font-size: 18px" v-if="
+                        worksStudent[jdIndex][rwIndex][toolIndex].length > 0
+                      ">
                         作业预览
                       </div>
                       <div>
@@ -2814,22 +2830,16 @@
       </div>
       <div style="margin-top: 10px">
         <div class="displayBox">
-          <div
-            style="
+          <div style="
               color: #556db4;
               font-size: 14px;
               font-weight: bold;
               padding-bottom: 10px;
-            "
-          >
+            ">
             评价
           </div>
           <div class="easy_comment">
-            <div
-              v-for="(p, pIndex) in PlTextList"
-              :key="pIndex"
-              @click="fastText(p, 1)"
-            >
+            <div v-for="(p, pIndex) in PlTextList" :key="pIndex" @click="fastText(p, 1)">
               {{ p }}
             </div>
           </div>
@@ -2930,11 +2940,7 @@
             <div v-if="e.detail">{{ e.detail }}</div>
           </div>
           <div class="easy_comment" v-if="isStar == false">
-            <div
-              v-for="(p, pIndex) in PlTextList"
-              :key="pIndex"
-              @click="fastText(p, 2)"
-            >
+            <div v-for="(p, pIndex) in PlTextList" :key="pIndex" @click="fastText(p, 2)">
               {{ p }}
             </div>
           </div>
@@ -7633,6 +7639,28 @@ export default {
 .easy_comment div:hover {
   border: 1px solid #f7ba2a;
   color: #c69217;
+}.xuan_right_box {
+  padding: 10px;
+  background: rgb(247, 247, 247);
+  margin: 10px 12px;
+  border-radius: 5px;
+}
+
+.tool_right_box {
+  display: flex;
+  align-items: center;
+}
+
+.tool_right_box+.tool_right_box {
+  margin-top: 10px;
+}
+
+.right_box_xuan {
+  background: rgb(0 123 255);
+  color: #fff;
+  border-radius: 5px;
+  padding: 5px;
+  margin-left: 10px;
 }
 .pButton {
   position: fixed;