Merge branch 'master' of http://git.cc-lotus.info/new_train/frame

config/lesson-template.js

@@ -0,0 +1,69 @@
+export const lesson = [
+  {
+    time: `08:00-11:30`,
+    day1type: '活动',
+    day6type: '活动',
+    day1: '--',
+    day2: '',
+    day3: '',
+    day4: '',
+    day5: '',
+    day6: '--',
+  },
+  {
+    time: `11:30-13:30`,
+    day1type: '活动',
+    day2type: '活动',
+    day3type: '活动',
+    day4type: '活动',
+    day5type: '活动',
+    day6type: '活动',
+    day1: '--',
+    day2: '午餐+休息',
+    day3: '午餐+休息',
+    day4: '午餐+休息',
+    day5: '午餐+休息',
+    day6: '--',
+  },
+  {
+    time: `13:30-16:30`,
+    day1type: '活动',
+    day6type: '活动',
+    day1: '报道+开班仪式',
+    day2: '',
+    day3: '',
+    day4: '',
+    day5: '',
+    day6: '--',
+  },
+  {
+    time: `16:30-17:30`,
+    day1type: '活动',
+    day2type: '活动',
+    day3type: '活动',
+    day4type: '活动',
+    day5type: '活动',
+    day6type: '活动',
+    day1: '晚餐',
+    day2: '晚餐',
+    day3: '晚餐',
+    day4: '晚餐',
+    day5: '晚餐',
+    day6: '--',
+  },
+  {
+    time: `17:30-19:45`,
+    day1type: '活动',
+    day2type: '活动',
+    day3type: '活动',
+    day4type: '活动',
+    day5type: '活动',
+    day6type: '活动',
+    day1: '团队组建',
+    day2: '拓展交流',
+    day3: '课程作业小组展示	',
+    day4: '课程作业',
+    day5: '礼仪课小组面试	',
+    day6: '结业仪式',
+  },
+];

config/menu-config.js

@@ -1,37 +1,22 @@
-export const devMenu = [
-  {
-    path: '',
-    name: '测试',
-    module: 'center',
-    children: [
-      {
-        path: '/list',
-        name: '测试列表',
-      },
-      {
-        path: '/detail',
-        name: '测试详情',
-      },
-    ],
-  },
+export const center = [
   {
     path: '',
     name: '系统管理',
     module: 'center',
     children: [
       {
-        path: '/director/index',
-        name: '班主任管理',
+        path: '/dept/index',
+        name: '部门管理',
         module: 'center',
       },
       {
-        path: '/dept/index',
-        name: '部门管理',
+        path: '/school/index',
+        name: '学校管理',
         module: 'center',
       },
       {
         path: '/location/index',
-        name: '地点管理',
+        name: '班级管理',
         module: 'center',
       },
       {
@@ -39,11 +24,6 @@ export const devMenu = [
         name: '寝室管理',
         module: 'center',
       },
-      // {
-      //   path: '/classes/index',
-      //   name: '班级管理',
-      //   module: 'center',
-      // },
       {
         path: '/subject/index',
         name: '科目管理',
@@ -57,18 +37,35 @@ export const devMenu = [
     ],
   },
   {
-    path: '/plan/index',
-    name: '计划管理',
-    module: 'center',
-  },
-  {
-    path: '/teacher/index',
-    name: '教师管理',
+    path: '',
+    name: '人员管理',
     module: 'center',
+    children: [
+      {
+        path: '/director/index',
+        name: '班主任管理',
+        module: 'center',
+      },
+      {
+        path: '/teacher/index',
+        name: '教师管理',
+        module: 'center',
+      },
+      {
+        path: '/student/index',
+        name: '学生管理',
+        module: 'center',
+      },
+      {
+        path: '/leave/index',
+        name: '请假查看',
+        module: 'center',
+      },
+    ],
   },
   {
-    path: '/student/index',
-    name: '学生管理',
+    path: '/plan/index',
+    name: '计划管理',
     module: 'center',
   },
 
@@ -88,12 +85,12 @@ export const devMenu = [
     module: 'center',
     children: [
       { path: '/questionnaire/index', name: '问卷管理' },
-      { path: '/itembank/index', name: '题库管理' },
+      { path: '/itembank/index', name: '问卷题库' },
       { path: '/questionstate/index', name: '问卷进度' },
     ],
   },
-
-  //学校
+];
+export const school = [
   {
     path: '',
     name: '测试',
@@ -124,7 +121,8 @@ export const devMenu = [
     name: '请假管理',
     module: 'school',
   },
-  //班主任
+];
+export const director = [
   {
     path: '',
     name: '测试',
@@ -150,8 +148,8 @@ export const devMenu = [
     name: '班级管理',
     module: 'director',
   },
-
-  //学校
+];
+export const teacher = [
   {
     path: '/plan/index',
     name: '查看计划', //上报名单

layout/admin/admin-menu.vue

@@ -36,8 +36,9 @@
 </template>
 
 <script>
-import { devMenu } from '@frame/config/menu-config';
+import * as menus from '@frame/config/menu-config';
 import scrollBar from './scrollBar.vue';
+import _ from 'lodash';
 export default {
   name: 'admin-menu',
   props: {},
@@ -54,7 +55,7 @@ export default {
     },
   },
   mounted() {
-    let arr = devMenu.filter(fil => fil.module === this.project_modules);
+    let arr = _.get(menus, this.project_modules, []);
     this.$set(this, `menu`, arr);
   },
   methods: {