Merge branch 'dev-mvp-20200331' of...

Merge branch 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331

* 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin:
  更改获取的id名称
  限制图片上传尺寸
  优化选择模板的跳转

src/components/education/template/baseMessage.vue

@@ -450,10 +450,10 @@ export default {
       const isJPG = file.type === "image/jpeg";
       const isPNG = file.type === "image/png";
       const isLt2M = file.size / 1024 / 1024 < fileLimit.size;
-      // if (file.width != fileLimit.width || file.height != fileLimit.height) {
-      //   vm.$message.error("图片不符合规范，请根据规范上传图片");
-      //   return;
-      // }
+      if (file.width != fileLimit.width || file.height != fileLimit.height) {
+        vm.$message.error("图片不符合规范，请根据规范上传图片");
+        return;
+      }
       if (!isJPG && !isPNG) {
         vm.$message.error("图片不符合规范，请根据规范上传图片");
         return;

src/components/education/template/templateMessage.vue

@@ -359,17 +359,19 @@ export default {
   methods: {
     // 设置已有的基本信息
     setBaseMessage(data) {
-      this.formData = Object.assign(this.formData, data.projectData);
-      this.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl;
-      this.formData.attachmentMore1 = Object.assign(this.formData.attachmentMore1, data.attachmentData[0]);
-      this.formData.projectBegintime = this.formData.projectBegintime ? new Date(this.formData.projectBegintime) : '';
-      this.formData.projectEndtime = this.formData.projectBegintime ? new Date(this.formData.projectEndtime) : '';
+      vm.formData = Object.assign(vm.formData, data.projectData);
+      vm.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl;
+      vm.formData.attachmentMore1 = Object.assign(vm.formData.attachmentMore1, data.attachmentData[0]);
+             // 暂存为1   下一步为3
+      vm.formData.projectType = vm.formData.projectType == 0 ? 3 : vm.formData.projectType;
+      vm.formData.projectBegintime = vm.formData.projectBegintime ? new Date(vm.formData.projectBegintime) : '';
+      vm.formData.projectEndtime = vm.formData.projectBegintime ? new Date(vm.formData.projectEndtime) : '';
       if (data.attachmentData[1]) {
-        // this.formData.attachmentUrl2 = data.attachmentData[1].attachmentType == 1 ? data.attachmentData[1].attachmentUrl : '';
-        // this.formData.attachmentUrl3 =  data.attachmentData[1].attachmentType == 2 ? data.attachmentData[1].attachmentUrl : '';
-         this.formData.attachmentUrl2 = data.attachmentData[1].attachmentUrl;
-        this.formData.type = data.attachmentData[1].attachmentType;
-        this.formData.attachmentMore2 = Object.assign(this.formData.attachmentMore2, data.attachmentData[1]);
+        // vm.formData.attachmentUrl2 = data.attachmentData[1].attachmentType == 1 ? data.attachmentData[1].attachmentUrl : '';
+        // vm.formData.attachmentUrl3 =  data.attachmentData[1].attachmentType == 2 ? data.attachmentData[1].attachmentUrl : '';
+         vm.formData.attachmentUrl2 = data.attachmentData[1].attachmentUrl;
+        vm.formData.type = data.attachmentData[1].attachmentType;
+        vm.formData.attachmentMore2 = Object.assign(vm.formData.attachmentMore2, data.attachmentData[1]);
       }
     },
     // 获取选择模板后的基本信息
@@ -379,7 +381,7 @@ export default {
         .then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
-            this.setBaseMessage(res.data);
+            vm.setBaseMessage(res.data);
           } else {
             vm.$message.info(res.message);
           }
@@ -396,7 +398,7 @@ export default {
         .then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
-            this.setBaseMessage(res.data)
+            vm.setBaseMessage(res.data)
           } else {
             vm.$message.info(res.message);
           }
@@ -461,10 +463,10 @@ export default {
       const isJPG = file.type === "image/jpeg";
       const isPNG = file.type === "image/png";
       const isLt2M = file.size / 1024 / 1024 < fileLimit.size;
-      // if (file.width != fileLimit.width || file.height != fileLimit.height) {
-      //   vm.$message.error("图片不符合规范，请根据规范上传图片");
-      //   return;
-      // }
+      if (file.width != fileLimit.width || file.height != fileLimit.height) {
+        vm.$message.error("图片不符合规范，请根据规范上传图片");
+        return;
+      }
       if (!isJPG && !isPNG) {
         vm.$message.error("图片不符合规范，请根据规范上传图片");
         return;
@@ -596,8 +598,8 @@ export default {
     },
     // 暂存
     save() {
-      if (this.$refs['formData'].projectName == '') {
-        this.$refs['formData'].validateField('projectName')
+      if (vm.$refs['formData'].projectName == '') {
+        vm.$refs['formData'].validateField('projectName')
       } else {
         vm.insertOrupdate(1);
       };
@@ -605,7 +607,7 @@ export default {
     // 新增或者更新基本信息
     insertOrupdate(status) {
       // 暂存为1   下一步为3
-       vm.formData.projectStatus = status;
+      vm.formData.projectStatus = status;
       // 图片或者视频地址
       vm.formData.attachmentMore1.attachmentUrl = vm.formData.attachmentUrl1;
       vm.formData.attachmentMore2.attachmentUrl = vm.formData.attachmentUrl2;
@@ -625,7 +627,7 @@ export default {
         closeLoading(vm);
         if (res.code == "000000" && status == 3) {
           // 下一步,并将项目id传递
-          this.$emit('next',res.data.id);
+          vm.$emit('next',res.data.id);
         } else if (res.code == "213061") {
            vm.dialogObj.visible = true;
         } else {
@@ -652,7 +654,7 @@ export default {
     // 确定
     hide() {
       vm.dialogObj.visible = false;
-      this.$emit('backSelectVue')
+      vm.$emit('backSelectVue')
     }
   }
 }

src/views/education/template-open.vue

@@ -145,7 +145,7 @@ export default {
   },
   methods: {
     isEditorFn(){
-      if(vm.$route.query.id) {
+      if(vm.$route.query.projectId) {
         vm.projectId = vm.$route.query.id;
         vm.editor = true;
         vm.active = 1;
@@ -155,11 +155,7 @@ export default {
     // 下一步
     nextStep() {
       if (vm.active == 0) {
-        // let flag = vm.checkSelectTemplate();
-        let flag = true;
-        if (flag) {
-          vm.active = 1;
-        }
+        vm.checkSelectTemplate()
         return;
       }
       if (vm.active == 1) {
@@ -253,11 +249,12 @@ export default {
           closeLoading(vm);
           if (res.code == "000000") {
               if (res.data.status == 0) {
-                return true;
+                vm.active = 1;
+                return;
               } else {
                 vm.dialogObj = Object.assign(vm.dialogObj, vm.statusObj[`status_${res.data.status}`]);
                 vm.dialogObj.visible = true;
-                return false;
+                return;
               }
           } else {
             vm.$message.info(res.message);