deason 3 жил өмнө
parent
commit
4474a53203

+ 44 - 38
src/modules/basic/view/clientConfig.vue

@@ -740,24 +740,27 @@ export default {
             return;
           }
 
-          this.ruleForm.properties.OE_STUDENT_SYS_NAME = this.ruleForm.OE_STUDENT_SYS_NAME;
+          this.ruleForm.properties.OE_STUDENT_SYS_NAME =
+            this.ruleForm.OE_STUDENT_SYS_NAME;
           this.ruleForm.properties.LOGO_FILE_URL = this.ruleForm.LOGO_FILE_URL;
-          this.ruleForm.properties.STUDENT_CLIENT_DEFAULT_SIZE = this.ruleForm.STUDENT_CLIENT_DEFAULT_SIZE;
-          this.ruleForm.properties.STUDENT_CLIENT_CONSOLE_CONFIG = this.ruleForm.STUDENT_CLIENT_CONSOLE_CONFIG;
-          this.ruleForm.properties.LOGIN_TYPE = this.ruleForm.LOGIN_TYPE = this.ruleForm.loginType.join(
-            ","
-          );
-          this.ruleForm.properties.LOGIN_SUPPORT = this.ruleForm.LOGIN_SUPPORT = this.ruleForm.loginSupport.join(
-            ","
-          );
-          this.ruleForm.properties.STUDENT_CODE_LOGIN_ALIAS = this.ruleForm.STUDENT_CODE_LOGIN_ALIAS;
-          this.ruleForm.properties.IDENTITY_NUMBER_LOGIN_ALIAS = this.ruleForm.IDENTITY_NUMBER_LOGIN_ALIAS;
+          this.ruleForm.properties.STUDENT_CLIENT_DEFAULT_SIZE =
+            this.ruleForm.STUDENT_CLIENT_DEFAULT_SIZE;
+          this.ruleForm.properties.STUDENT_CLIENT_CONSOLE_CONFIG =
+            this.ruleForm.STUDENT_CLIENT_CONSOLE_CONFIG;
+          this.ruleForm.properties.LOGIN_TYPE = this.ruleForm.LOGIN_TYPE =
+            this.ruleForm.loginType.join(",");
+          this.ruleForm.properties.LOGIN_SUPPORT = this.ruleForm.LOGIN_SUPPORT =
+            this.ruleForm.loginSupport.join(",");
+          this.ruleForm.properties.STUDENT_CODE_LOGIN_ALIAS =
+            this.ruleForm.STUDENT_CODE_LOGIN_ALIAS;
+          this.ruleForm.properties.IDENTITY_NUMBER_LOGIN_ALIAS =
+            this.ruleForm.IDENTITY_NUMBER_LOGIN_ALIAS;
           if (
             this.ruleForm.preventCheatingConfig == null ||
             this.ruleForm.preventCheatingConfig.length == 0
           ) {
-            this.ruleForm.properties.PREVENT_CHEATING_CONFIG = this.ruleForm.PREVENT_CHEATING_CONFIG =
-              "NONE";
+            this.ruleForm.properties.PREVENT_CHEATING_CONFIG =
+              this.ruleForm.PREVENT_CHEATING_CONFIG = "NONE";
           } else {
             let defaultArr = [];
             for (let lt of PREVENT_CHEATING_CONFIG) {
@@ -781,15 +784,16 @@ export default {
             } else {
               res = validArr.join(",");
             }
-            this.ruleForm.properties.PREVENT_CHEATING_CONFIG = this.ruleForm.PREVENT_CHEATING_CONFIG = res;
+            this.ruleForm.properties.PREVENT_CHEATING_CONFIG =
+              this.ruleForm.PREVENT_CHEATING_CONFIG = res;
           }
 
           if (
             this.ruleForm.studentClientVersion == null ||
             this.ruleForm.studentClientVersion.length == 0
           ) {
-            this.ruleForm.properties.STUDENT_CLIENT_VERSION = this.ruleForm.STUDENT_CLIENT_VERSION =
-              "NONE";
+            this.ruleForm.properties.STUDENT_CLIENT_VERSION =
+              this.ruleForm.STUDENT_CLIENT_VERSION = "NONE";
           } else {
             let defaultArr = [];
             for (let lt of STUDENT_CLIENT_VERSION) {
@@ -813,12 +817,15 @@ export default {
             } else {
               res = validArr.join(",");
             }
-            this.ruleForm.properties.STUDENT_CLIENT_VERSION = this.ruleForm.STUDENT_CLIENT_VERSION = res;
+            this.ruleForm.properties.STUDENT_CLIENT_VERSION =
+              this.ruleForm.STUDENT_CLIENT_VERSION = res;
           }
 
-          this.ruleForm.properties.IS_CUSTOM_MENU_LOGO = this.ruleForm.IS_CUSTOM_MENU_LOGO;
+          this.ruleForm.properties.IS_CUSTOM_MENU_LOGO =
+            this.ruleForm.IS_CUSTOM_MENU_LOGO;
           if (this.ruleForm.IS_CUSTOM_MENU_LOGO == "true") {
-            this.ruleForm.properties.CUS_MENU_LOGO_FILE_URL = this.ruleForm.CUS_MENU_LOGO_FILE_URL;
+            this.ruleForm.properties.CUS_MENU_LOGO_FILE_URL =
+              this.ruleForm.CUS_MENU_LOGO_FILE_URL;
           }
 
           Promise.all([
@@ -889,7 +896,8 @@ export default {
         });
         let fileUrl = response;
 
-        this.ruleForm.LOGO_FILE_URL = this.ruleForm.properties.LOGO_FILE_URL = fileUrl;
+        this.ruleForm.LOGO_FILE_URL = this.ruleForm.properties.LOGO_FILE_URL =
+          fileUrl;
       } else {
         this.errDialog = true;
       }
@@ -907,7 +915,8 @@ export default {
         });
         let fileUrl = response;
 
-        this.ruleForm.ANSWERS_TEMPLATE = this.ruleForm.properties.ANSWERS_TEMPLATE = fileUrl;
+        this.ruleForm.ANSWERS_TEMPLATE =
+          this.ruleForm.properties.ANSWERS_TEMPLATE = fileUrl;
       } else {
         this.errDialog = true;
       }
@@ -1054,9 +1063,8 @@ export default {
             this.ruleForm.IDENTITY_NUMBER_LOGIN_ALIAS;
 
           if (this.ruleForm.properties.LOGIN_TYPE) {
-            this.ruleForm.loginType = this.ruleForm.properties.LOGIN_TYPE.split(
-              ","
-            );
+            this.ruleForm.loginType =
+              this.ruleForm.properties.LOGIN_TYPE.split(",");
           } else {
             let defaultValue = [];
             for (let lt of LOGIN_TYPE) {
@@ -1067,16 +1075,14 @@ export default {
           }
 
           if (this.ruleForm.properties.LOGIN_SUPPORT) {
-            this.ruleForm.loginSupport = this.ruleForm.properties.LOGIN_SUPPORT.split(
-              ","
-            );
+            this.ruleForm.loginSupport =
+              this.ruleForm.properties.LOGIN_SUPPORT.split(",");
           }
 
           if (this.ruleForm.properties.PREVENT_CHEATING_CONFIG) {
             if (this.ruleForm.properties.PREVENT_CHEATING_CONFIG != "NONE") {
-              this.ruleForm.preventCheatingConfig = this.ruleForm.properties.PREVENT_CHEATING_CONFIG.split(
-                ","
-              );
+              this.ruleForm.preventCheatingConfig =
+                this.ruleForm.properties.PREVENT_CHEATING_CONFIG.split(",");
             } else {
               this.ruleForm.preventCheatingConfig = [];
             }
@@ -1091,9 +1097,8 @@ export default {
 
           if (this.ruleForm.properties.STUDENT_CLIENT_VERSION) {
             if (this.ruleForm.properties.STUDENT_CLIENT_VERSION != "NONE") {
-              this.ruleForm.studentClientVersion = this.ruleForm.properties.STUDENT_CLIENT_VERSION.split(
-                ","
-              );
+              this.ruleForm.studentClientVersion =
+                this.ruleForm.properties.STUDENT_CLIENT_VERSION.split(",");
             } else {
               this.ruleForm.studentClientVersion = [];
             }
@@ -1281,7 +1286,8 @@ export default {
         });
         let fileUrl = response;
 
-        this.ruleForm.CUS_MENU_LOGO_FILE_URL = this.ruleForm.properties.CUS_MENU_LOGO_FILE_URL = fileUrl;
+        this.ruleForm.CUS_MENU_LOGO_FILE_URL =
+          this.ruleForm.properties.CUS_MENU_LOGO_FILE_URL = fileUrl;
       } else {
         this.errDialog = true;
       }
@@ -1339,8 +1345,8 @@ export default {
     //清空文件
     removeAnswerFile() {
       this.answerFileList = [];
-      this.ruleForm.ANSWERS_TEMPLATE = this.ruleForm.properties.ANSWERS_TEMPLATE =
-        "";
+      this.ruleForm.ANSWERS_TEMPLATE =
+        this.ruleForm.properties.ANSWERS_TEMPLATE = "";
       if (this.$refs.uploadAnswer) {
         this.$refs.uploadAnswer.clearFiles();
       }
@@ -1400,8 +1406,8 @@ export default {
     //清空文件
     removeMenuLogoFile() {
       this.menuLogoFileList = [];
-      this.ruleForm.CUS_MENU_LOGO_FILE_URL = this.ruleForm.properties.CUS_MENU_LOGO_FILE_URL =
-        "";
+      this.ruleForm.CUS_MENU_LOGO_FILE_URL =
+        this.ruleForm.properties.CUS_MENU_LOGO_FILE_URL = "";
       if (this.$refs.menuLogUpload) {
         this.$refs.menuLogUpload.clearFiles();
       }

+ 14 - 7
src/modules/basic/view/school_config.vue

@@ -238,14 +238,21 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.ruleForm.properties.STUDENT_CLIENT_ACCESS_FROM_THIRD_PARTY = this.ruleForm.STUDENT_CLIENT_ACCESS_FROM_THIRD_PARTY;
-          this.ruleForm.properties.STUDENT_CLIENT_THIRD_PARTY_LOGIN_URL = this.ruleForm.STUDENT_CLIENT_THIRD_PARTY_LOGIN_URL;
-          this.ruleForm.properties.SHOW_QMTH_LOGO = this.ruleForm.SHOW_QMTH_LOGO;
-          this.ruleForm.properties.ID_NUMBER_PRIVATE_MODE = this.ruleForm.ID_NUMBER_PRIVATE_MODE;
+          this.ruleForm.properties.STUDENT_CLIENT_ACCESS_FROM_THIRD_PARTY =
+            this.ruleForm.STUDENT_CLIENT_ACCESS_FROM_THIRD_PARTY;
+          this.ruleForm.properties.STUDENT_CLIENT_THIRD_PARTY_LOGIN_URL =
+            this.ruleForm.STUDENT_CLIENT_THIRD_PARTY_LOGIN_URL;
+          this.ruleForm.properties.SHOW_QMTH_LOGO =
+            this.ruleForm.SHOW_QMTH_LOGO;
+          this.ruleForm.properties.ID_NUMBER_PRIVATE_MODE =
+            this.ruleForm.ID_NUMBER_PRIVATE_MODE;
           this.ruleForm.properties.APP_ENABLED = this.ruleForm.APP_ENABLED;
-          this.ruleForm.properties.WEIXIN_ANSWER_ENABLED = this.ruleForm.WEIXIN_ANSWER_ENABLED;
-          this.ruleForm.properties.SHOW_STUDENT_CLIENT_APP_QRCODE = this.ruleForm.SHOW_STUDENT_CLIENT_APP_QRCODE;
-          this.ruleForm.properties.IDENTIFICATION_OF_LIVING_BODY_SCHEME = this.ruleForm.IDENTIFICATION_OF_LIVING_BODY_SCHEME;
+          this.ruleForm.properties.WEIXIN_ANSWER_ENABLED =
+            this.ruleForm.WEIXIN_ANSWER_ENABLED;
+          this.ruleForm.properties.SHOW_STUDENT_CLIENT_APP_QRCODE =
+            this.ruleForm.SHOW_STUDENT_CLIENT_APP_QRCODE;
+          this.ruleForm.properties.IDENTIFICATION_OF_LIVING_BODY_SCHEME =
+            this.ruleForm.IDENTIFICATION_OF_LIVING_BODY_SCHEME;
 
           this.$httpWithMsg
             .put(CORE_API + "/org/saveOrgProperties", this.ruleForm)

+ 2 - 1
src/modules/basic/view/unimportant_school_config.vue

@@ -157,7 +157,8 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.ruleForm.properties.THIRD_PARTY_API_DEFAULT_EXAM_ID = this.ruleForm.THIRD_PARTY_API_DEFAULT_EXAM_ID;
+          this.ruleForm.properties.THIRD_PARTY_API_DEFAULT_EXAM_ID =
+            this.ruleForm.THIRD_PARTY_API_DEFAULT_EXAM_ID;
 
           this.$httpWithMsg
             .put(CORE_API + "/org/saveOrgProperties", this.ruleForm)

+ 2 - 1
src/modules/examwork/view/examIpLimit.vue

@@ -475,7 +475,8 @@ export default {
         ip: [
           { required: true, message: "Ip不能为空!", trigger: "change" },
           {
-            pattern: /^(?:(?:1[0-9][0-9]\.)|(?:2[0-4][0-9]\.)|(?:25[0-5]\.)|(?:[1-9][0-9]\.)|(?:[0-9/*]\.)){3}(?:(?:1[0-9][0-9])|(?:2[0-4][0-9])|(?:25[0-5])|(?:[1-9][0-9])|(?:[0-9/*]))$/,
+            pattern:
+              /^(?:(?:1[0-9][0-9]\.)|(?:2[0-4][0-9]\.)|(?:25[0-5]\.)|(?:[1-9][0-9]\.)|(?:[0-9/*]\.)){3}(?:(?:1[0-9][0-9])|(?:2[0-4][0-9])|(?:25[0-5])|(?:[1-9][0-9])|(?:[0-9/*]))$/,
             message: "请输入正确的ip格式",
           },
         ],

+ 4 - 8
src/modules/examwork/view/stageSpecialSettings.vue

@@ -730,16 +730,12 @@ export default {
       };
     },
     handleSubmitDuration() {
-      this.editStageCommonSettingForm.submitDuration = this.editStageCommonSettingForm.submitDuration.replace(
-        /[^\d]/g,
-        ""
-      );
+      this.editStageCommonSettingForm.submitDuration =
+        this.editStageCommonSettingForm.submitDuration.replace(/[^\d]/g, "");
     },
     handleSubmitDuration4editStage() {
-      this.editStageForm.submitDuration = this.editStageForm.submitDuration.replace(
-        /[^\d]/g,
-        ""
-      );
+      this.editStageForm.submitDuration =
+        this.editStageForm.submitDuration.replace(/[^\d]/g, "");
     },
     handleAddStage() {
       this.resetAddStageForm();

+ 1 - 2
src/modules/oe/component/commonExport.vue

@@ -64,8 +64,7 @@ export default {
           .then((response) => {
             if (response.data) {
               var blob = new Blob([response.data], {
-                type:
-                  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
               });
               var url = URL.createObjectURL(blob);
               var a = document.createElement("a");

+ 4 - 4
src/modules/oe/views/examPaperDetail.vue

@@ -245,8 +245,8 @@ export default {
       var optionList = question.questionOptionList;
       //单选,多选
       if (optionList && optionList.length > 0) {
-        var correctAnswerInExamQuestion = this.examQuestionList[order - 1]
-          .correctAnswer;
+        var correctAnswerInExamQuestion =
+          this.examQuestionList[order - 1].correctAnswer;
         //如果是字母,说明是旧数据
         var reg = /^[a-zA-Z]+$/; //匹配任意字母
         if (
@@ -261,8 +261,8 @@ export default {
           }
           question.quesOptions = optionList; //选项
         } else {
-          var optionPermutation = this.examQuestionList[order - 1]
-            .optionPermutation;
+          var optionPermutation =
+            this.examQuestionList[order - 1].optionPermutation;
           for (var i2 = 0; i2 < optionList.length; i2++) {
             optionList[i2].optionId = i2;
           }

+ 2 - 4
src/modules/oe/views/examSummary.vue

@@ -638,8 +638,7 @@ export default {
         .then((response) => {
           if (response.data) {
             var blob = new Blob([response.data], {
-              type:
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+              type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
             });
             var url = URL.createObjectURL(blob);
             var a = document.createElement("a");
@@ -667,8 +666,7 @@ export default {
         .then((response) => {
           if (response.data) {
             var blob = new Blob([response.data], {
-              type:
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+              type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
             });
             var url = URL.createObjectURL(blob);
             var a = document.createElement("a");

+ 3 - 6
src/modules/questions/routes/routes.js

@@ -128,13 +128,11 @@ export default [
         component: InsertPaperTitle,
       },
       {
-        path:
-          "edit_other_question/:paperId/:paperDetailId/:questionType/:courseNo/:courseName",
+        path: "edit_other_question/:paperId/:paperDetailId/:questionType/:courseNo/:courseName",
         component: EditOtherQuestion,
       },
       {
-        path:
-          "edit_select_question/:paperId/:paperDetailId/:questionType/:courseNo/:courseName",
+        path: "edit_select_question/:paperId/:paperDetailId/:questionType/:courseNo/:courseName",
         component: EditSelectQuestion,
       },
     ],
@@ -144,8 +142,7 @@ export default [
     component: EditPaper,
   },
   {
-    path:
-      "/select_question/:id/:courseNo/:courseName/:paperDetailId/:parentView", //试卷选题
+    path: "/select_question/:id/:courseNo/:courseName/:paperDetailId/:parentView", //试卷选题
     component: SelectQuestion,
   },
   {

+ 2 - 1
src/modules/questions/views/EditPaper.vue

@@ -1232,7 +1232,8 @@ export default {
             }
           }
           setTimeout(() => {
-            document.documentElement.scrollTop = document.body.scrollTop = scrollPosition;
+            document.documentElement.scrollTop = document.body.scrollTop =
+              scrollPosition;
             console.log(scrollPosition);
           }, 1000);
           this.loading = false;

+ 2 - 1
src/modules/questions/views/ExportStructure.vue

@@ -731,7 +731,8 @@ export default {
       this.exportStructure.examId = this.exportStructureCopy.examId;
       this.exportStructure.exportType = this.exportStructureCopy.exportTypeOld;
       this.exportStructure.useable = this.exportStructureCopy.useable;
-      this.exportStructure.questionTypeNums = this.exportStructureCopy.questionTypeNums;
+      this.exportStructure.questionTypeNums =
+        this.exportStructureCopy.questionTypeNums;
       let examId = this.exportStructure.examId;
       this.exportStructure.examName = _.filter(
         this.examListNew,

+ 4 - 6
src/modules/questions/views/ExtractPaperInfo.vue

@@ -394,9 +394,8 @@ export default {
                 let groupCode = examPaper.paperType;
                 let weight =
                   this.extractConfig.examType == "TRADITION" ? 100 : "";
-                let examPaperListByGroupCode = this.getWeightFromExamPaperList(
-                  groupCode
-                );
+                let examPaperListByGroupCode =
+                  this.getWeightFromExamPaperList(groupCode);
                 if (examPaperListByGroupCode) {
                   _examPaperList.push({
                     groupCode: groupCode,
@@ -799,9 +798,8 @@ export default {
                   let groupCode = examPaper.paperType;
                   let weight =
                     this.extractConfig.examType == "TRADITION" ? 100 : "";
-                  let examPaperListByGroupCode = this.getWeightFromExamPaperList(
-                    groupCode
-                  );
+                  let examPaperListByGroupCode =
+                    this.getWeightFromExamPaperList(groupCode);
                   if (examPaperListByGroupCode) {
                     _examPaperList.push({
                       groupCode: groupCode,

+ 6 - 3
src/modules/questions/views/InsertBluePaperStructureInfo.vue

@@ -432,7 +432,8 @@ export default {
                 });
             } else {
               //修改
-              this.coursePropertyNumberDtos = this.paperDetailStruct.coursePropertyNumberDtos;
+              this.coursePropertyNumberDtos =
+                this.paperDetailStruct.coursePropertyNumberDtos;
               this.count = paperDetailStruct.detailCount;
               this.publicSimpleCount = paperDetailStruct.publicSimpleCount;
               this.publicMediumCount = paperDetailStruct.publicMediumCount;
@@ -715,13 +716,15 @@ export default {
       }
       this.paperDetailStruct.detailCount = this.count;
       this.paperDetailStruct.id = this.paperDetailStructId;
-      this.paperDetailStruct.coursePropertyNumberDtos = this.coursePropertyNumberDtos;
+      this.paperDetailStruct.coursePropertyNumberDtos =
+        this.coursePropertyNumberDtos;
       this.paperDetailStruct.publicSimpleCount = this.publicSimpleCount;
       this.paperDetailStruct.publicMediumCount = this.publicMediumCount;
       this.paperDetailStruct.publicDifficultyCount = this.publicDifficultyCount;
       this.paperDetailStruct.noPublicSimpleCount = this.noPublicSimpleCount;
       this.paperDetailStruct.noPublicMediumCount = this.noPublicMediumCount;
-      this.paperDetailStruct.noPublicDifficultyCount = this.noPublicDifficultyCount;
+      this.paperDetailStruct.noPublicDifficultyCount =
+        this.noPublicDifficultyCount;
       for (let paperDetailStruct of this.blueStruct.paperDetailStructs) {
         if (this.paperDetailStruct.id == paperDetailStruct.id) {
           paperDetailStruct = this.paperDetailStruct;

+ 4 - 2
src/modules/questions/views/InsertPaperStructureInfo.vue

@@ -994,10 +994,12 @@ export default {
               unitStruct.quesNames = this.paperUnitForm2.quesNames;
               unitStruct.publicSimple = this.paperUnitForm2.publicSimple;
               unitStruct.publicMedium = this.paperUnitForm2.publicMedium;
-              unitStruct.publicDifficulty = this.paperUnitForm2.publicDifficulty;
+              unitStruct.publicDifficulty =
+                this.paperUnitForm2.publicDifficulty;
               unitStruct.noPublicSimple = this.paperUnitForm2.noPublicSimple;
               unitStruct.noPublicMedium = this.paperUnitForm2.noPublicMedium;
-              unitStruct.noPublicDifficulty = this.paperUnitForm2.noPublicDifficulty;
+              unitStruct.noPublicDifficulty =
+                this.paperUnitForm2.noPublicDifficulty;
               unitStruct.publicSum = this.paperUnitForm2.publicSum;
               unitStruct.noPublicSum = this.paperUnitForm2.noPublicSum;
               unitStruct.simpleSum = this.paperUnitForm2.simpleSum;

+ 3 - 3
src/modules/questions/views/Question.vue

@@ -638,9 +638,9 @@ export default {
                 subQuestionMultipleRightAnswer.push(orderNum2);
               }
             }
-            subQuestion[
-              "quesAnswer"
-            ] = subQuestionMultipleRightAnswer.sort().toString();
+            subQuestion["quesAnswer"] = subQuestionMultipleRightAnswer
+              .sort()
+              .toString();
           }
         }
       }

+ 3 - 3
src/modules/questions/views/SelectQuestion.vue

@@ -402,9 +402,9 @@ export default {
                 subQuestionMultipleRightAnswer.push(orderNum_k);
               }
             }
-            subQuestion[
-              "quesAnswer"
-            ] = subQuestionMultipleRightAnswer.sort().toString();
+            subQuestion["quesAnswer"] = subQuestionMultipleRightAnswer
+              .sort()
+              .toString();
           }
         }
       }

+ 2 - 1
src/modules/questions/views/ViewPaper.vue

@@ -669,7 +669,8 @@ export default {
             }
           }
           setTimeout(() => {
-            document.documentElement.scrollTop = document.body.scrollTop = scrollPosition;
+            document.documentElement.scrollTop = document.body.scrollTop =
+              scrollPosition;
             console.log(scrollPosition);
           }, 1000);
           this.loading = false;