Merge branch 'dev_1.2.1' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.1

src/modules/questions/views/License.vue

@@ -101,23 +101,23 @@
       <h1 class="part-box-title">登录配置</h1>
       <el-form class="padding-tb-20" label-width="150px">
         <el-form-item label="短信验证">
-          <el-radio-group v-model="setForm.LOGIN_CODE_CHECK">
+          <el-radio-group v-model="setForm.properties.LOGIN_CODE_CHECK">
             <el-radio label="true">开启</el-radio>
             <el-radio label="false">关闭</el-radio>
           </el-radio-group>
           <div class="tips-info">*开启后，登录需要输入手机验证码</div>
         </el-form-item>
         <el-form-item label="安全U盾">
-          <el-radio-group v-model="setForm.LOGIN_UD_CHECK">
+          <el-radio-group v-model="setForm.properties.LOGIN_UD_CHECK">
             <el-radio label="true">开启</el-radio>
             <el-radio label="false">关闭</el-radio>
           </el-radio-group>
           <div class="tips-info">*开启后，需要插入安全U盾才能正常登录</div>
         </el-form-item>
-        <template v-if="setForm.LOGIN_UD_CHECK == 'true'">
+        <template v-if="setForm.properties.LOGIN_UD_CHECK == 'true'">
           <el-form-item>
-            <el-radio-group v-model="setForm.LOGIN_UD_CHECK_ONECE">
-              <el-radio label="false"
+            <el-radio-group v-model="setForm.properties.LOGIN_UD_CHECK_ONECE">
+              <el-radio label="rule1"
                 >安全策略1
                 <span class="tips-info margin-left-10"
                   >使用期间均会检测安全U盾是否正常，如果出现异常，会强制踢出用户进入异常提示页面</span
@@ -125,7 +125,7 @@
               >
 
               <div class="margin-top-20"></div>
-              <el-radio label="true"
+              <el-radio label="rule2"
                 >安全策略2
                 <span class="tips-info margin-left-10"
                   >仅对登录阶段进行检测，如果未检测到安全U盾，无法登录</span
@@ -182,9 +182,11 @@ export default {
         ],
       },
       setForm: {
-        LOGIN_CODE_CHECK: "false",
-        LOGIN_UD_CHECK: "false",
-        LOGIN_UD_CHECK_ONECE: "false",
+        properties: {
+          LOGIN_CODE_CHECK: "false",
+          LOGIN_UD_CHECK: "false",
+          LOGIN_UD_CHECK_ONECE: "",
+        },
       },
     };
   },
@@ -227,6 +229,15 @@ export default {
           this.info.activation = "未授权";
         }
       });
+      this.initForm();
+    },
+    initForm() {
+      var url = QUESTION_API + "/org/all-sys-properties";
+      this.$httpWithMsg.get(url).then((response) => {
+        if (response.data) {
+          this.setForm.properties = response.data;
+        }
+      });
     },
     //提交
     submitForm() {
@@ -251,7 +262,7 @@ export default {
       }
     },
     submitSetForm() {
-      let url = QUESTION_API + "/org/saveOrgProperties";
+      let url = QUESTION_API + "/org/save-sys-properties";
       this.$httpWithMsg.put(url, this.setForm).then(() => {
         this.$notify({
           type: "success",

src/modules/questions/views/OrgProperty.vue

@@ -359,6 +359,10 @@ export default {
             this.form.properties.CHECK_DUPLICATE_COUNT =
               response.data.CHECK_DUPLICATE_COUNT;
           }
+          if (response.data.PAPER_BUILD_SYNTHESIS) {
+            this.form.properties.PAPER_BUILD_SYNTHESIS =
+              response.data.PAPER_BUILD_SYNTHESIS;
+          }
         }
       });
     },