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

src/components/studyStudent.vue

@@ -2567,8 +2567,9 @@
                 {{ index1 + 1 + "、" }}
                 <div>题目：{{ askJson.askJson[index1].askstitle }}</div>
               </div>
+              <img v-if="askJson.askJson[index1].img" :src="askJson.askJson[index1].img" style="width:100%;margin-top:10px" />
             </div>
-            <div class="a_add_body" v-if="!isAnswer">
+            <div class="a_add_body">
               <div class="a_add_input">
                 <el-radio-group v-model="radio[index1]">
                   <el-radio
@@ -2576,23 +2577,9 @@
                       .checkList"
                     :key="checkIndex"
                     :label="checkIndex"
+                    :disabled="isAnswer"
                     class="redioStyle"
-                    >{{ item2 }}</el-radio
-                  >
-                </el-radio-group>
-              </div>
-            </div>
-            <div class="a_add_body" v-else>
-              <div class="a_add_input">
-                <el-radio-group v-model="radio[index1]">
-                  <el-radio
-                    v-for="(item2, checkIndex) in askJson.askJson[index1]
-                      .checkList"
-                    :key="checkIndex"
-                    :label="checkIndex"
-                    disabled
-                    class="redioStyle"
-                    >{{ item2 }}</el-radio
+                    ><span v-html="item2"></span></el-radio
                   >
                 </el-radio-group>
               </div>
@@ -3850,7 +3837,7 @@ export default {
                   var checkL = JSON.parse(data.content)[0].anwer.split(",");
                   for (var z = 0; z < checkL.length; z++) {
                     if (!this.checkJson[i][z]) {
-                      this.checkJson[i].push({ checkCount: [] });
+                      this.checkJson[i].push({ checkCount: [],checkPerson:[] });
                     }
                     if (!this.checkJson[i][z].checkCount.length) {
                       this.checkJson[i][z].checkCount = [];
@@ -3860,6 +3847,11 @@ export default {
                         this.checkJson[i][z].checkCount.push(0);
                       }
                     }
+                    this.checkJson[i][z].checkPerson[parseInt(checkL[z])]
+                      ? this.checkJson[i][z].checkPerson[parseInt(checkL[z])].push(data.name)
+                      : (this.checkJson[i][z].checkPerson[
+                          parseInt(checkL[z])
+                        ] = [data.name]);
                     this.checkJson[i][z].checkCount[parseInt(checkL[z])]
                       ? this.checkJson[i][z].checkCount[parseInt(checkL[z])]++
                       : (this.checkJson[i][z].checkCount[
@@ -6273,10 +6265,12 @@ export default {
 
 .a_add_head {
   display: flex;
-  align-items: center;
-  justify-content: space-between;
+  align-items: flex-start;
+  /* justify-content: space-between; */
+  flex-direction: column;
   margin: 10px 0;
   font-size: 18px;
+  width: 100%;
 }
 .a_add_head .a_add_head_input {
   width: 300px;