Merge branch 'dev-edu-lern-20190621' into release

package-lock.json

@@ -2306,9 +2306,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.9.1",
-      "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.9.1.tgz",
-      "integrity": "sha1-oF8udgI9Upug36LQOuFuUTSyDE4=",
+      "version": "2.6.1",
+      "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.6.1.tgz",
+      "integrity": "sha1-htt5/13psbzDGHtls3crDFQHRxg=",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -2777,8 +2777,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3180,8 +3179,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3236,7 +3234,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3280,14 +3277,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

src/views/education/create-component.vue

@@ -466,11 +466,14 @@ export default {
     },
     created() {
         vm = this
-        vm.componentId = vm.$route.query.id
-        vm.componentStatus = vm.$route.query.status  // 3 启用  4 禁用
-        vm.resultFlag = vm.$route.query.resultFlag  // 判断可编辑范围是基础信息还是全部信息  1 为全部  2 为基础
-        vm.getCertificateList() // 获取证书列表
-        vm.componentBasicInfo() // 根据ID查询组件基本信息
+        vm.componentId = vm.$route.query.id;
+        vm.componentStatus = vm.$route.query.status;  // 3 启用  4 禁用
+        vm.resultFlag = vm.$route.query.resultFlag;  // 判断可编辑范围是基础信息还是全部信息  1 为全部  2 为基础
+        vm.getCertificateList(); // 获取证书列表
+        vm.componentBasicInfo(); // 根据ID查询组件基本信息
+        vm.getTestListData(); // 获取考试列表
+        vm.getCourseData(); // 获取课程列表
+        vm.getTemplateData(); // 获取模板信息
         vm.conditionSelect = vm.resultFlag == 2 || vm.componentStatus == 3 || vm.componentStatus == 4
 //        vm.conditionSelect = vm.resultFlag == 2 || vm.componentStatus == 4
         vm.newconditionSelect = vm.componentStatus == 4
@@ -600,10 +603,10 @@ export default {
                                     }
                                     if(flag == 2) {
                                         vm.stepNum = 2
-                                        vm.getTemplateData()
+                                        //vm.getTemplateData()
                                         vm.getModuleData()
-                                        vm.getTestListData()
-                                        vm.getCourseData()
+                                        // vm.getTestListData()
+                                        // vm.getCourseData()
                                     } else {
                                         vm.$message.info("暂存成功！")
                                     }
@@ -624,10 +627,10 @@ export default {
                         }
                         if(flag == 2) {
                             vm.stepNum = 2
-                            vm.getTemplateData()
+                            //vm.getTemplateData()
                             vm.getModuleData()
-                            vm.getTestListData()
-                            vm.getCourseData()
+                            // vm.getTestListData()
+                            // vm.getCourseData()
                         } else {
                             vm.$message.info("暂存成功！")
                         }