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

src/modules/oe/views/captureDetail.vue

@@ -77,18 +77,22 @@
                   sortable
                   label="校验次数"
                   prop="faceTotalCount"
+                  width="110"
                 ></el-table-column>
                 <el-table-column
                   sortable
                   label="成功次数"
                   prop="faceSuccessCount"
+                  width="110"
                 ></el-table-column>
                 <el-table-column
                   sortable
                   label="陌生人"
                   prop="faceStrangerCount"
+                  width="110"
                 ></el-table-column>
                 <el-table-column
+                  width="120"
                   sortable
                   label="成功率(%)"
                   prop="faceSuccessPercent"
@@ -98,12 +102,16 @@
                   label="违纪类型"
                   prop="disciplineType"
                 ></el-table-column>
+                <el-table-column sortable label="违纪说明">
+                  <template slot-scope="scope">
+                    <span
+                      v-html="disciplineTypeFilter(scope.row.disciplineDetail)"
+                    >
+                    </span>
+                  </template>
+                </el-table-column>
                 <el-table-column
-                  sortable
-                  label="违纪说明"
-                  prop="disciplineDetail"
-                ></el-table-column>
-                <el-table-column
+                  width="110"
                   sortable
                   label="审核结果"
                   prop="status"
@@ -243,10 +251,22 @@ export default {
     },
     back() {
       this.$router.back();
+    },
+    disciplineTypeFilter: function(value) {
+      debugger;
+      if (value && value.indexOf("&&") > -1) {
+        var arr = value.split("&&");
+        var detail = "";
+        for (var i = 0; i < arr.length; i++) {
+          detail += arr[i] + "<br>";
+        }
+        return detail;
+      } else {
+        return value;
+      }
     }
   },
   created() {
-    debugger;
     this.examRecordDataId = this.$route.params.examRecordDataId;
     var fromPage = this.$route.params.from;
     if (fromPage == "awaitingAudit") {