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

src/modules/basic/view/clientConfig.vue

@@ -28,6 +28,7 @@
             :on-progress="uploadProgress"
             :on-success="uploadSuccess"
             :on-error="uploadError"
+            :on-remove="handleRemove"
             :file-list="fileList"
             :auto-upload="false"
             :multiple="false"
@@ -114,7 +115,7 @@ export default {
     return {
       rootOrgId: null,
       loginTypes: LOGIN_TYPE,
-      propertyGroupId: "studentClientConfig",
+      propertyGroupId: "",
       preventCheatingConfigs: PREVENT_CHEATING_CONFIG,
       ruleForm: {
         relatedPropertyGroupIdList: [],
@@ -147,7 +148,7 @@ export default {
           { min: 1, max: 50, message: "长度在 1 到 50 个字符", trigger: "blur" }
         ],
         LOGO_FILE_URL: [
-          { required: true, message: "请选择学校logo", trigger: "blur" }
+          { required: true, message: "请选择学校logo", trigger: "change" }
         ],
         loginType: [
           {
@@ -207,7 +208,7 @@ export default {
     initForm() {
       this.ruleForm.orgId = this.user.rootOrgId;
       this.ruleForm.STUDENT_CLIENT_DEFAULT_SIZE = "1400*900";
-      this.ruleForm.relatedPropertyGroupIdList = [this.propertyGroupId];
+      this.ruleForm.relatedPropertyGroupIdList = ["studentClientConfig"];
       var url =
         CORE_API +
         "/org/getOrgPropertiesByGroupWithoutCache/" +
@@ -372,14 +373,12 @@ export default {
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
+      this.removeFile();
     }
   },
   created() {
     this.rootOrgId = this.user.rootOrgId;
-    this.propertyGroupId = "studentClientConfig";
+    this.propertyGroupId = "studentClientConfig4Edit";
     this.uploadAction = CORE_API + "/org/importLogo/" + this.rootOrgId;
     this.uploadHeaders = {
       key: this.user.key,