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/router/router.js

@@ -17,18 +17,18 @@ const editCme = r => require.ensure([], () => r(require('../views/education/edit
 import patientsRouters from './patients'
 import followRouters from './follow'
 
+const reportLisOld = r => require.ensure([], () => r(require('../views/learning-o/report-list.vue')), 'report-list-old')
+const itemListOld = r => require.ensure([], () => r(require('../views/learning-o/item-list.vue')), 'item-list-old')
+const nameListOld = r => require.ensure([], () => r(require('../views/learning-o/name-list.vue')), 'name-list-old')
+const dataAlignmentOld = r => require.ensure([], () => r(require('../views/learning-o/data-alignment.vue')), 'data-alignment-old')
+const exportDownloadOld = r => require.ensure([], () => r(require('../views/learning-o/export-download.vue')), 'export-download-old')
+
 const reportLis = r => require.ensure([], () => r(require('../views/learning/report-list.vue')), 'report-list')
 const itemList = r => require.ensure([], () => r(require('../views/learning/item-list.vue')), 'item-list')
 const nameList = r => require.ensure([], () => r(require('../views/learning/name-list.vue')), 'name-list')
 const dataAlignment = r => require.ensure([], () => r(require('../views/learning/data-alignment.vue')), 'data-alignment')
 const exportDownload = r => require.ensure([], () => r(require('../views/learning/export-download.vue')), 'export-download')
 
-const reportLisOld = r => require.ensure([], () => r(require('../views/learning-o/report-list.vue')), 'report-list')
-const itemListOld = r => require.ensure([], () => r(require('../views/learning-o/item-list.vue')), 'item-list')
-const nameListOld = r => require.ensure([], () => r(require('../views/learning-o/name-list.vue')), 'name-list')
-const dataAlignmentOld = r => require.ensure([], () => r(require('../views/learning-o/data-alignment.vue')), 'data-alignment')
-const exportDownloadOld = r => require.ensure([], () => r(require('../views/learning-o/export-download.vue')), 'export-download')
-
 const itemShield = r => require.ensure([], () => r(require('../views/education/item-shield.vue')), 'item-shield')
 const entryManager = r => require.ensure([], () => r(require('../views/education/entry-manager.vue')), 'entry-manager')
 const editEntry = r => require.ensure([], () => r(require('../views/education/edit-entry.vue')), 'edit-entry')

src/views/education/item-manager.vue

@@ -71,10 +71,10 @@
       </el-row>
       <el-form v-if="isRoleOfOuter" :model="formInline" class="demo-form-inline">
         <el-form-item>
-          <el-button class="add-button" :disabled="idType == 2 && masterAdministratorFlag == 'false'" size="small" type="primary" @click="openProject()">新建项目</el-button>
+          <el-button class="add-button" size="small" type="primary" @click="openProject()">新建项目</el-button>
         </el-form-item>
       </el-form>
-      <el-table :data="tableData" style="width: 100%">
+      <el-table class="item-table" :data="tableData" style="width: 100%">
         <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
         <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
@@ -173,7 +173,7 @@
             >屏蔽</el-button>
             <el-button
               @click="addOrModifyNotice(scope.row, 0)"
-              v-if="masterAdministratorFlag == 'true'"
+              v-if="scope.row.level != 'L3'"
               type="primary"
               size="small"
             >公告</el-button>
@@ -377,7 +377,6 @@ export default {
         }
       },
       idType: '',
-      masterAdministratorFlag: false,
       deleteVisible: false,
       isRoleOfOuter: 0,
     };
@@ -386,13 +385,11 @@ export default {
     ...mapGetters([
       "_token",
       // "idType",
-      // "masterAdministratorFlag"
     ])
   },
   created() {
     vm = this;
     vm.idType = localStorage.getItem('storageIdType');
-    vm.masterAdministratorFlag = localStorage.getItem('storageMaster');
     console.log('idType:',vm.idType);
     if(this.$route.query.pageNum){
       this.formInline = {...this.$store.state.common.itemManager}
@@ -424,15 +421,12 @@ export default {
       this.deleteVisible = false;
     },
     
+    // 打开新建页面
     openProject() {
-      if(vm.masterAdministratorFlag == 'true') {
-        this.centerDialogVisible = true;
+      if(vm.idType == 2) {
+        vm.toTemplatePage();
       } else {
-        if(vm.idType == 2) {
-          vm.toTemplatePage();
-        } else {
-          vm.toPage();
-        }
+        this.centerDialogVisible = true;
       }
     },
     toPage() {
@@ -764,6 +758,9 @@ export default {
 };
 </script>
 <style lang="scss">
+.item-table .el-button {
+  margin: 5px 0;
+}
 .item-manager-wrap {
   .component-content {
     background: #fff;

src/views/layout/slidebar.vue

@@ -201,9 +201,7 @@
       this.getUserType();
     },
     mounted(){
-      if(vm.storageIdType==2){
-       vm.setFollowSide()
-      }
+
     },
     watch: {
       authList(newVal, oldVal){
@@ -218,17 +216,12 @@
         }
       },
       storageIdType(val,ov){
-        // if(val==2){    // 调试时已经去掉了
-          vm.setFollowSide()
-        // }              // 调试时已经去掉了
-      },
-      masterFlag(newVal, oldVal) {
-        // console.log('新老:',newVal,oldVal)
-        // 入口管理暂时判断
-        if(newVal === true) {
+        if(val == 1){    
           vm.setEntrySide();
+        } else if(val == 2) {
+          vm.setFollowSide();
         }
-      }
+      },
     },
     methods: {
       getUserType() {
@@ -284,6 +277,7 @@
         vm.items.push(followSider);
       },
       setEntrySide() {
+        console.log(222);
         const followSider = {
           title: '入口管理',
           icon: 'el-icon-setting',
@@ -298,7 +292,7 @@
         const eduRole = {
           title: '角色权限',
           icon: 'el-icon-menu',
-          index: 'role-auth',
+          index: 'role',
           subs: [
             {
               title: '发起教培项目赋权',

src/views/learning/item-list.vue

@@ -3,7 +3,7 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
       <div v-if="staticData == 1" class="item-form">
-        <div class="form-title">查询条件</div>
+        <div class="form-title">查询条件2333</div>
         <div class="form-p">
           <p>
             <span>选择地区</span>