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

src/router/index.js

@@ -83,12 +83,6 @@ const routes = [
         meta: { title: '班级', sub: '考勤' },
         component: () => import('@/views/classes/attendance.vue'),
       },
-      {
-        path: '/classes/leave',
-        name: 'classes_leave',
-        meta: { title: '班级', sub: '请假' },
-        component: () => import('@/views/classes/leave.vue'),
-      },
       {
         path: '/student/detail',
         name: 'student_detail',

src/store/index.js

@@ -20,6 +20,7 @@ import bedroom from '@frame/store/bedroom';
 import login from '@frame/store/login';
 import util from '@frame/store/util';
 import attendance from '@frame/store/attendance';
+import leave from '@frame/store/leave';
 import * as ustate from '@frame/store/user/state';
 import * as umutations from '@frame/store/user/mutations';
 Vue.use(Vuex);
@@ -46,6 +47,7 @@ export default new Vuex.Store({
     util,
     attendance,
     bedroom,
+    leave,
   },
   state: { ...ustate },
   mutations: { ...umutations },

src/views/classes/attendance.vue

@@ -1,18 +1,22 @@
 <template>
   <div id="attendance">
-    <attendanceInfo :classId="classId"></attendanceInfo>
+    <listFrame :title="pageTitle" @query="search" :total="total" :needFilter="false" :returns="toreturn" :needAdd="false">
+      <attendanceInfo :classId="classId" @initTotal="initTotal"></attendanceInfo>
+    </listFrame>
   </div>
 </template>
 
 <script>
 import attendanceInfo from '@frame/parts/attendance';
+import listFrame from '@frame/layout/admin/list-frame';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'attendance',
   props: {},
-  components: { attendanceInfo },
+  components: { attendanceInfo, listFrame },
   data: () => ({
     classId: {},
+    total: 0,
   }),
   created() {
     this.initId();
@@ -26,6 +30,12 @@ export default {
     async initId() {
       this.classId = this.id;
     },
+    toreturn() {
+      window.history.go(-1);
+    },
+    initTotal(total) {
+      this.$set(this, `total`, total);
+    },
   },
 };
 </script>

src/views/classes/classes.vue

@@ -27,6 +27,7 @@
           @lesson="toLesson"
           @bedRoom="toBedRoom"
           @qingjia="toQj"
+          @attendance="toAtt"
         ></data-table>
       </el-card>
     </list-frame>
@@ -75,9 +76,14 @@ export default {
       },
       {
         label: '请假管理',
-        icon: 'iconfont iconqingjia',
+        icon: 'el-icon-timer',
         method: 'qingjia',
       },
+      {
+        label: '考勤管理',
+        icon: 'el-icon-map-location',
+        method: 'attendance',
+      },
     ],
     fields: [
       { label: '班级名称', prop: 'name' },
@@ -137,6 +143,9 @@ export default {
     toQj({ data }) {
       this.$router.push({ path: '/classes/qingjia', query: { id: data.id } });
     },
+    toAtt({ data }) {
+      this.$router.push({ path: '/classes/attendance', query: { id: data.id } });
+    },
   },
 };
 </script>

src/views/classes/leave.vue

@@ -1,19 +0,0 @@
-<template>
-  <div id="leave">
-    <p>leave</p>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'leave',
-  props: {},
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="less" scoped></style>

src/views/classes/qingjia.vue

@@ -1,29 +1,50 @@
 <template>
   <div id="qingjia">
-    <list-frame :title="pageTitle" @query="search" :total="total" :needFilter="false" :returns="toreturn" :needAdd="false"> </list-frame>
+    <listFrame :title="pageTitle" @query="search" :total="total" :needFilter="false" :returns="toreturn" :needAdd="false">
+      <leaveInfo :classId="classId" @initTotal="initTotal"></leaveInfo>
+    </listFrame>
   </div>
 </template>
 
 <script>
 import _ from 'lodash';
+import listFrame from '@frame/layout/admin/list-frame';
+import leaveInfo from '@frame/parts/leave';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: mapLeave } = createNamespacedHelpers('leave');
 export default {
   name: 'qingjia',
   props: {},
-  components: {},
+  components: { leaveInfo, listFrame },
   data: function() {
-    return {};
+    return {
+      classId: {},
+      total: 0,
+    };
+  },
+  created() {
+    this.initId();
   },
-  created() {},
   methods: {
+    async initId() {
+      this.classId = this.id;
+    },
     async search({ skip = 0, limit = 10, ...info } = {}) {},
+    toreturn() {
+      window.history.go(-1);
+    },
+    initTotal(total) {
+      this.$set(this, `total`, total);
+    },
   },
   computed: {
     ...mapState(['user']),
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
+    id() {
+      return this.$route.query.id;
+    },
   },
   metaInfo() {
     return { title: this.$route.meta.title };