Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-admin-web

src/modules/examwork/view/student.vue

@@ -154,7 +154,7 @@
                   <tr>
                     <td style="color: green">学号</td>
                     <td style="color:purple;padding-left: 20px;">
-                      {{ scope.row.studentCode }}
+                      {{ scope.row.studentCodeList }}
                     </td>
                   </tr>
                   <tr>
@@ -189,12 +189,9 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="studentCode"
-            width=""
-            label="学号"
-            sortable
-          ></el-table-column>
+          <el-table-column label="学号">
+            <span slot-scope="scope" v-html="scope.row.studentCodesStr"> </span>
+          </el-table-column>
           <el-table-column
             prop="identityNumber"
             width=""