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

src/constants/constants.js

@@ -80,6 +80,6 @@ export const PREVENT_CHEATING_CONFIG = [
   { code: "DISABLE_REMOTE_ASSISTANCE", name: "禁用远程协助" },
   { code: "DISABLE_VIRTUAL_CAMERA", name: "禁用虚拟摄像头" },
   { code: "DISABLE_VIRTUAL_MACHINE", name: "禁用虚拟机" },
-  { code: "DISABLE_FULL_SCREEN_TOP", name: "强制全屏置顶" },
+  { code: "FULL_SCREEN_TOP", name: "强制全屏置顶" },
   { code: "DISABLE_MULTISCREEN", name: "禁用双屏" }
 ];

src/modules/basic/view/clientConfig.vue

@@ -263,9 +263,13 @@ export default {
           }
 
           if (this.ruleForm.properties.PREVENT_CHEATING_CONFIG) {
-            this.ruleForm.preventCheatingConfig = this.ruleForm.properties.PREVENT_CHEATING_CONFIG.split(
-              ","
-            );
+            if (this.ruleForm.properties.PREVENT_CHEATING_CONFIG != "NONE") {
+              this.ruleForm.preventCheatingConfig = this.ruleForm.properties.PREVENT_CHEATING_CONFIG.split(
+                ","
+              );
+            } else {
+              this.ruleForm.preventCheatingConfig = [];
+            }
           } else {
             let defaultValue = [];
             for (let lt of PREVENT_CHEATING_CONFIG) {