fix

src/modules/portal/views/home/main/HomeMain.vue

@@ -16,7 +16,13 @@
             <div class="cover"></div>
           </div>
           <div
-            class="align-self-left d-flex d-flex flex-column align-items-start module-desc"
+            class="
+              align-self-left
+              d-flex d-flex
+              flex-column
+              align-items-start
+              module-desc
+            "
           >
             <div class="h4">{{ menu.name }}</div>
             <div style="width: 400px; font-size: 14px; text-align: left">

src/modules/questions/views/InsertBluePaperStructureInfo.vue

@@ -445,7 +445,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;
@@ -728,13 +729,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;

src/modules/questions/views/OrgProperty.vue

@@ -149,9 +149,177 @@
                 </el-row>
               </el-tab-pane>
               <!-- 审核配置 -->
-              <el-tab-pane label="审核配置" name="tab2"> </el-tab-pane>
+              <el-tab-pane label="审核配置" name="tab2">
+                <el-row>
+                  <el-form-item label="题库审核">
+                    <el-radio-group
+                      v-model="form.properties.PAPER_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">开启</el-radio>
+                      <el-radio label="false">关闭</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.PAPER_AUDIT == 'true'">
+                  <el-form-item
+                    label="初级审核"
+                    :label-width="style.label_width_tab2"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.PAPER_FIRST_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">正常流程</el-radio>
+                      <el-radio label="false">免审流程</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.PAPER_AUDIT == 'true'">
+                  <el-form-item
+                    label="中级审核"
+                    :label-width="style.label_width_tab2"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.PAPER_SECOND_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">正常流程</el-radio>
+                      <el-radio label="false">免审流程</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.PAPER_AUDIT == 'true'">
+                  <el-form-item
+                    label="高级审核"
+                    :label-width="style.label_width_tab2"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.PAPER_THIRD_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">正常流程</el-radio>
+                      <el-radio label="false">免审流程</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row>
+                  <el-form-item label="卷库审核">
+                    <el-radio-group
+                      v-model="form.properties.EXAM_PAPER_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">开启</el-radio>
+                      <el-radio label="false">关闭</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.EXAM_PAPER_AUDIT == 'true'">
+                  <el-form-item
+                    label="初级审核"
+                    :label-width="style.label_width_tab2"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.EXAM_PAPER_FIRST_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">正常流程</el-radio>
+                      <el-radio label="false">免审流程</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.EXAM_PAPER_AUDIT == 'true'">
+                  <el-form-item
+                    label="中级审核"
+                    :label-width="style.label_width_tab2"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.EXAM_PAPER_SECOND_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">正常流程</el-radio>
+                      <el-radio label="false">免审流程</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.EXAM_PAPER_AUDIT == 'true'">
+                  <el-form-item
+                    label="高级审核"
+                    :label-width="style.label_width_tab2"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.EXAM_PAPER_THIRD_AUDIT"
+                      class="input"
+                    >
+                      <el-radio label="true">正常流程</el-radio>
+                      <el-radio label="false">免审流程</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+              </el-tab-pane>
               <!-- 查重配置 -->
-              <el-tab-pane label="查重配置" name="tab3"> </el-tab-pane>
+              <el-tab-pane label="查重配置" name="tab3"
+                ><el-row>
+                  <el-form-item
+                    label="是否开启查重"
+                    :label-width="style.label_width_tab3"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.CHECK_DUPLICATE"
+                      class="input"
+                    >
+                      <el-radio label="true">开启</el-radio>
+                      <el-radio label="false">关闭</el-radio>
+                    </el-radio-group></el-form-item
+                  >
+                </el-row>
+                <el-row v-if="form.properties.CHECK_DUPLICATE == 'true'">
+                  <el-form-item
+                    label="通过阀值"
+                    :label-width="style.label_width_tab3"
+                  >
+                    <el-input-number
+                      v-model="form.properties.CHECK_DUPLICATE_THRESHOLD"
+                      size="small"
+                      :precision="1"
+                      :min="0"
+                      :max="100"
+                    ></el-input-number>
+                  </el-form-item>
+                </el-row>
+                <el-row v-if="form.properties.CHECK_DUPLICATE == 'true'">
+                  <el-form-item
+                    label="陈列数量"
+                    :label-width="style.label_width_tab3"
+                  >
+                    <el-input-number
+                      v-model="form.properties.CHECK_DUPLICATE_COUNT"
+                      size="small"
+                      :precision="0"
+                      :min="1"
+                      :max="5"
+                    ></el-input-number>
+                  </el-form-item>
+                </el-row>
+                <el-row v-if="form.properties.CHECK_DUPLICATE == 'true'">
+                  <el-form-item
+                    label="题型范围"
+                    :label-width="style.label_width_tab3"
+                  >
+                    <el-radio-group
+                      v-model="form.properties.CHECK_DUPLICATE_RANGE"
+                      class="input"
+                    >
+                      <el-radio label="NO_CROSS_QUESTION_TYPE"
+                        >本题型查重</el-radio
+                      >
+                      <el-radio label="CROSS_QUESTION_TYPE"
+                        >跨题型查重</el-radio
+                      >
+                    </el-radio-group>
+                  </el-form-item>
+                </el-row>
+              </el-tab-pane>
             </el-tabs>
           </el-form>
         </div>
@@ -172,8 +340,8 @@ export default {
   data() {
     return {
       style: {
-        label_width_tab1: "160px",
-        label_width_tab2: "110px",
+        label_width_tab1: "120px",
+        label_width_tab2: "120px",
         label_width_tab3: "120px",
       },
       activeName: "tab1",
@@ -186,6 +354,18 @@ export default {
           ROOT_ORG_QUESTION_TYPES2: [],
           ROOT_ORG_QUESTION_TYPES3: [],
           QUESTION_TYPE_SPECIAL_SET: [],
+          PAPER_AUDIT: "false",
+          PAPER_FIRST_AUDIT: "false",
+          PAPER_SECOND_AUDIT: "false",
+          PAPER_THIRD_AUDIT: "false",
+          EXAM_PAPER_AUDIT: "false",
+          EXAM_PAPER_FIRST_AUDIT: "false",
+          EXAM_PAPER_SECOND_AUDIT: "false",
+          EXAM_PAPER_THIRD_AUDIT: "false",
+          CHECK_DUPLICATE: "false",
+          CHECK_DUPLICATE_THRESHOLD: 80,
+          CHECK_DUPLICATE_COUNT: 5,
+          CHECK_DUPLICATE_RANGE: "CROSS_QUESTION_TYPE",
         },
       },
       rules: {
@@ -203,24 +383,88 @@ export default {
       "(" +
       this.$route.params.rootOrgCode +
       ")";
+    if (!this.form.orgId) {
+      this.form.orgId = sessionStorage.getItem("org_prop_info_ord_id");
+      this.rootOrgName = sessionStorage.getItem("org_prop_info_ord_name");
+    } else {
+      sessionStorage.setItem("org_prop_info_ord_id", this.form.orgId);
+      sessionStorage.setItem("org_prop_info_ord_name", this.rootOrgName);
+    }
     this.init();
   },
   methods: {
     init() {
       var url = QUESTION_API + "/org/allProperties/" + this.form.orgId;
       this.$httpWithMsg.get(url).then((response) => {
-        this.form.properties.ROOT_ORG_QUESTION_TYPES1 = JSON.parse(
-          response.data.ROOT_ORG_QUESTION_TYPES1
-        );
-        this.form.properties.ROOT_ORG_QUESTION_TYPES2 = JSON.parse(
-          response.data.ROOT_ORG_QUESTION_TYPES2
-        );
-        this.form.properties.ROOT_ORG_QUESTION_TYPES3 = JSON.parse(
-          response.data.ROOT_ORG_QUESTION_TYPES3
-        );
-        this.form.properties.QUESTION_TYPE_SPECIAL_SET = JSON.parse(
-          response.data.QUESTION_TYPE_SPECIAL_SET
-        );
+        if (response.data) {
+          if (response.data.ROOT_ORG_QUESTION_TYPES1) {
+            this.form.properties.ROOT_ORG_QUESTION_TYPES1 = JSON.parse(
+              response.data.ROOT_ORG_QUESTION_TYPES1
+            );
+          }
+          if (response.data.ROOT_ORG_QUESTION_TYPES2) {
+            this.form.properties.ROOT_ORG_QUESTION_TYPES2 = JSON.parse(
+              response.data.ROOT_ORG_QUESTION_TYPES2
+            );
+          }
+          if (response.data.ROOT_ORG_QUESTION_TYPES3) {
+            this.form.properties.ROOT_ORG_QUESTION_TYPES3 = JSON.parse(
+              response.data.ROOT_ORG_QUESTION_TYPES3
+            );
+          }
+          if (response.data.QUESTION_TYPE_SPECIAL_SET) {
+            this.form.properties.QUESTION_TYPE_SPECIAL_SET = JSON.parse(
+              response.data.QUESTION_TYPE_SPECIAL_SET
+            );
+          }
+          if (response.data.PAPER_AUDIT) {
+            this.form.properties.PAPER_AUDIT = response.data.PAPER_AUDIT;
+          }
+          if (response.data.PAPER_FIRST_AUDIT) {
+            this.form.properties.PAPER_FIRST_AUDIT =
+              response.data.PAPER_FIRST_AUDIT;
+          }
+          if (response.data.PAPER_SECOND_AUDIT) {
+            this.form.properties.PAPER_SECOND_AUDIT =
+              response.data.PAPER_SECOND_AUDIT;
+          }
+          if (response.data.PAPER_THIRD_AUDIT) {
+            this.form.properties.PAPER_THIRD_AUDIT =
+              response.data.PAPER_THIRD_AUDIT;
+          }
+          if (response.data.EXAM_PAPER_AUDIT) {
+            this.form.properties.EXAM_PAPER_AUDIT =
+              response.data.EXAM_PAPER_AUDIT;
+          }
+          if (response.data.EXAM_PAPER_FIRST_AUDIT) {
+            this.form.properties.EXAM_PAPER_FIRST_AUDIT =
+              response.data.EXAM_PAPER_FIRST_AUDIT;
+          }
+          if (response.data.EXAM_PAPER_SECOND_AUDIT) {
+            this.form.properties.EXAM_PAPER_SECOND_AUDIT =
+              response.data.EXAM_PAPER_SECOND_AUDIT;
+          }
+          if (response.data.EXAM_PAPER_THIRD_AUDIT) {
+            this.form.properties.EXAM_PAPER_THIRD_AUDIT =
+              response.data.EXAM_PAPER_THIRD_AUDIT;
+          }
+          if (response.data.CHECK_DUPLICATE) {
+            this.form.properties.CHECK_DUPLICATE =
+              response.data.CHECK_DUPLICATE;
+          }
+          if (response.data.CHECK_DUPLICATE_THRESHOLD) {
+            this.form.properties.CHECK_DUPLICATE_THRESHOLD =
+              response.data.CHECK_DUPLICATE_THRESHOLD;
+          }
+          if (response.data.CHECK_DUPLICATE_COUNT) {
+            this.form.properties.CHECK_DUPLICATE_COUNT =
+              response.data.CHECK_DUPLICATE_COUNT;
+          }
+          if (response.data.CHECK_DUPLICATE_RANGE) {
+            this.form.properties.CHECK_DUPLICATE_RANGE =
+              response.data.CHECK_DUPLICATE_RANGE;
+          }
+        }
       });
     },
     setParams() {
@@ -275,9 +519,6 @@ export default {
 };
 </script>
 <style scoped>
-.pull_length {
-  /* width: 240px; */
-}
 .input >>> .el-input__inner {
   -webkit-appearance: button;
 }

src/modules/questions/views/SelectQuestion.vue

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

src/modules/questions/views/ViewPaper.vue

@@ -752,7 +752,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;