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

src/views/index.vue

@@ -22,8 +22,7 @@ import NavBar from '@/layout/common/topInfo.vue';
 import footInfo from '@/layout/common/footInfo.vue';
 import mainData from '@/layout/index/mainData.vue';
 const { mapActions: lesson } = createNamespacedHelpers('lesson');
-import { createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
+import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 
 export default {
   name: 'index',
@@ -45,9 +44,10 @@ export default {
   created() {
     this.getDate();
     this.searchInfo();
-    this.searchSite();
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   mounted() {
     this.title = this.$route.meta.title;
     this.isleftarrow = this.$route.meta.isleftarrow;
@@ -60,15 +60,12 @@ export default {
   },
   methods: {
     ...lesson({ lessionInfo: 'fetch', lessionlist: 'query' }),
-    ...mapStudent(['fetch']),
-    async searchSite() {
-      const res = await this.fetch('5e4f3d096a90e861b0f30871');
-      sessionStorage.setItem('site', JSON.stringify(res.data));
-    },
     async searchInfo({ ...info } = {}) {
       const res = await this.lessionlist({ ...info });
       for (const val of res.data) {
-        var arr = res.data.filter(item => item.class === '5e4df0c93ffa245d6065f526');
+        console.log(this.user.classid);
+        var arr = res.data.filter(item => item.class === this.user.classid);
+        console.log(arr);
         var aff = res.data[0].lessons;
         console.log(aff);
         var ahh = aff.map((i, index) => {

src/views/teacherscore/index.vue

@@ -22,8 +22,8 @@ import NavBar from '@/layout/teacherscore/topInfo.vue';
 import footInfo from '@/layout/common/footInfo.vue';
 import mainData from '@/layout/teacherscore/mainData.vue';
 const { mapActions: teacher } = createNamespacedHelpers('teacher');
-import { createNamespacedHelpers, mapGetters } from 'vuex';
-const { mapActions: mapStudent } = createNamespacedHelpers('student');
+// import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapScore } = createNamespacedHelpers('score');
 export default {
   name: 'index',
@@ -46,6 +46,7 @@ export default {
     this.searchInfo();
   },
   computed: {
+    ...mapState(['user']),
     id() {
       return this.$route.query.id;
     },
@@ -72,7 +73,6 @@ export default {
 
     async searchInfo() {
       const res = await this.teacherInfo(this.id);
-      console.log(res);
       let b = parseInt(res.data.xsscore);
       this.$set(this, `teacherinfo`, res.data);
       this.$set(this, `grade`, b);
@@ -80,11 +80,12 @@ export default {
     async onsave(form) {
       this.form.teacherid = this.id;
       this.form.lessonid = this.lessonid;
-      let site = JSON.parse(sessionStorage.getItem('site'));
-      this.form.stuid = site.id;
-      console.log(site.id);
+      console.log(this.user.id);
+      this.form.stuid = this.user.id;
       let data = this.form;
       let res = await this.create(data);
+      console.log(res);
+
       this.$message({
         message: '评分成功',
         type: 'success',

src/views/user/checkWork.vue

@@ -24,7 +24,7 @@
 import NavBar from '@/layout/common/topInfo.vue';
 import checkList from '@/layout/user/checkList.vue';
 import punchBtn from '@/layout/user/punchBtn.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapAttendance } = createNamespacedHelpers('attendance');
 export default {
   name: 'checkWork',
@@ -37,26 +37,26 @@ export default {
   data: () => ({
     info: {},
     checkWorkList: [
-      {
-        studentid: '流域',
-        attend: [
-          {
-            date: '2020-02-25',
-            time: '80:30',
-            status: '0',
-          },
-          {
-            date: '2020-02-25',
-            time: '80:30',
-            status: '1',
-          },
-          {
-            date: '2020-02-25',
-            time: '80:30',
-            status: '2',
-          },
-        ],
-      },
+      // {
+      //   studentid: '流域',
+      //   attend: [
+      //     {
+      //       date: '2020-02-25',
+      //       time: '80:30',
+      //       status: '0',
+      //     },
+      //     {
+      //       date: '2020-02-25',
+      //       time: '80:30',
+      //       status: '1',
+      //     },
+      //     {
+      //       date: '2020-02-25',
+      //       time: '80:30',
+      //       status: '2',
+      //     },
+      //   ],
+      // },
     ],
     show: false,
     form: {
@@ -71,9 +71,11 @@ export default {
   created() {
     this.searchInfo();
     this.getDate();
-    // this.search();
+    this.search();
+  },
+  computed: {
+    ...mapState(['user']),
   },
-  computed: {},
   mounted() {
     this.title = this.$route.meta.title;
     this.isleftarrow = this.$route.meta.isleftarrow;
@@ -86,11 +88,11 @@ export default {
   },
   methods: {
     ...mapAttendance(['fetch', 'create', 'query']),
-    // async search() {
-    //   const res = await this.query();
-    //   console.log(res);
-    //   this.$set(this, `checkWorkList`, res.data);
-    // },
+    async search() {
+      const res = await this.fetch();
+      console.log(res);
+      this.$set(this, `checkWorkList`, res.data);
+    },
     searchInfo() {
       let site = JSON.parse(sessionStorage.getItem('site'));
       this.$set(this.form, `batchid`, site.batchid);
@@ -100,15 +102,16 @@ export default {
       this.show = true;
     },
     async onSubmit(form) {
-      let site = JSON.parse(sessionStorage.getItem('site'));
-      console.log(site);
-      this.form.termid = '123456';
-      this.form.batchid = site.batchid;
-      this.form.ckassid = site.ckassid;
-      this.form.studentid = site.studentid;
+      console.log(this.user);
+      this.form.termid = this.user.termid;
+      this.form.batchid = this.user.batchid;
+      this.form.classid = this.user.classid;
+      this.form.studentid = this.user.userid;
       let data = this.form;
       console.log(this.form.batchid);
       let res = await this.create(data);
+      console.log(res);
+
       this.show = false;
     },
     getDate() {

src/views/user/index.vue

@@ -27,7 +27,7 @@ import NavBar from '@/layout/common/topInfo.vue';
 import footInfo from '@/layout/common/footInfo.vue';
 import messageInfo from '@/layout/user/messageInfo.vue';
 import clickBtn from '@/layout/user/clickBtn.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapStudent } = createNamespacedHelpers('student');
 export default {
   name: 'index',
@@ -40,23 +40,23 @@ export default {
   },
   data: () => ({
     info: {
-      name: '顾红伟',
-      id_number: '220182199603257019',
-      phone: '17319450324',
-      gender: '男',
-      nation: '汉族',
-      school_name: '吉林大学',
-      faculty: '计算机学院',
-      major: '应用软件技术专业',
-      entry_year: '2016',
-      finish_year: '2020',
-      school_job: '班长',
-      qq: '1345526645',
-      email: 'guhongwei0324@163.com',
-      family_place: '吉林省长春市朝阳区力旺广场B座16楼',
-      family_is_hard: '1',
-      have_grant: '1',
-      job: '班长',
+      // name: '顾红伟',
+      // id_number: '220182199603257019',
+      // phone: '17319450324',
+      // gender: '男',
+      // nation: '汉族',
+      // school_name: '吉林大学',
+      // faculty: '计算机学院',
+      // major: '应用软件技术专业',
+      // entry_year: '2016',
+      // finish_year: '2020',
+      // school_job: '班长',
+      // qq: '1345526645',
+      // email: 'guhongwei0324@163.com',
+      // family_place: '吉林省长春市朝阳区力旺广场B座16楼',
+      // family_is_hard: '1',
+      // have_grant: '1',
+      // job: '班长',
     },
     title: '',
     isleftarrow: '',
@@ -66,7 +66,9 @@ export default {
   created() {
     this.searchSite();
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   mounted() {
     this.title = this.$route.meta.title;
     this.isleftarrow = this.$route.meta.isleftarrow;
@@ -84,7 +86,8 @@ export default {
       if (site) {
         this.$set(this, `info`, JSON.parse(site));
       } else {
-        const res = await this.fetch('5e4f3d096a90e861b0f30871');
+        const res = await this.fetch(this.user.userid);
+        console.log(this.user.userid);
         if (res.errcode === 0) {
           sessionStorage.setItem('site', JSON.stringify(res.data));
           this.$set(this, `info`, res.data);

src/views/user/leaveDetail.vue

@@ -17,7 +17,8 @@
 <script>
 import NavBar from '@/layout/common/topInfo.vue';
 import leaveRequest from '@/layout/user/leaveRequest.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+// import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapLeave } = createNamespacedHelpers('leave');
 export default {
   name: 'leaveDetail',
@@ -35,6 +36,7 @@ export default {
   }),
   created() {},
   computed: {
+    ...mapState(['user']),
     keyWord() {
       let meta = this.$route.meta;
       let main = meta.title || '';
@@ -54,7 +56,8 @@ export default {
   methods: {
     ...mapLeave(['create']),
     async submitForm(form) {
-      this.form.studentid = '5e4f3d096a90e861b0f30871';
+      // this.form.studentid = '5e4f3d096a90e861b0f30871';
+      this.form.studentid = this.user.userid;
       let data = this.form;
       let res = await this.create(data);
       let msg = `${this.keyWord}添加成功`;