Merge remote-tracking branch 'origin/master'

src/modules/oe/views/captureDetail.vue

@@ -100,11 +100,17 @@
                   prop="faceSuccessPercent"
                 ></el-table-column>
                 <el-table-column
-                  width="120"
+                  width="140"
                   sortable
-                  label="真实性(%)"
+                  label="人脸真实性(%)"
                   prop="baiduFaceLivenessSuccessPercent"
                 ></el-table-column>
+                <el-table-column
+                  width="120"
+                  sortable
+                  label="虚拟设备"
+                  prop="virtualCameraNames"
+                ></el-table-column>
                 <el-table-column
                   sortable
                   label="违纪类型"

src/modules/print/view/CourseStatistic.vue

@@ -904,8 +904,8 @@ export default {
             console.log(error.response);
             curLoading.close();
             this.$notify({
-              title: "错误",
-              type: "error",
+              title: "提示",
+              type: "warning",
               message: error.response.data.desc
             });
           }