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

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

src/views/layout/slidebar.vue

@@ -219,7 +219,6 @@
         if(val == 1){
           vm.setEntrySide();
         } else if(val == 2) {
-          vm.items[1].title = '教育培训';
           vm.setFollowSide();
         }
       },
@@ -275,6 +274,7 @@
             }
           ]
         }
+        vm.items[1].title = '教育培训';
         vm.items.push(followSider);
       },
       setEntrySide() {
@@ -282,7 +282,7 @@
           title: '项目组件',
           icon: 'el-icon-setting',
           index: 'item-component'
-        };   
+        };
         const followSider = {
           title: '入口管理',
           icon: 'el-icon-setting',

src/views/learning/export-download.vue

@@ -73,8 +73,8 @@ export default {
   },
   data() {
     return {
-      curmbFirst: "学情报告",
-      curmbSecond: "任务列表",
+      curmbFirst: "教培项目",
+      curmbSecond: "下载报告",
       projectId: "",
       tableData: [],
       param: {
@@ -84,13 +84,17 @@ export default {
       totalRows: 0,
       totalTime: 3,
       queryData: {},
-      listType: "2"
+      listType: "2",
+      idType: 1,
       // buttonText: "刷新",
       // buttonStatus: false,
     };
   },
   created() {
     vm = this;
+    vm.idType = localStorage.getItem('storageIdType');
+    this.curmbFirst = vm.idType == 1 ? '教培项目' : '教育培训';
+
     this.projectId = vm.getUrlSearch(window.location.href, "projectId");
     let listType = vm.getUrlSearch(window.location.href, "listType");
     if(listType == null) {