wuhongyuq 5 years ago
parent
commit
439649b585
2 changed files with 97 additions and 68 deletions
  1. 3 3
      src/layout/class/achieveList/homeworkAchiece.vue
  2. 94 65
      src/views/class/achieve.vue

+ 3 - 3
src/layout/class/achieveList/homeworkAchiece.vue

@@ -4,10 +4,10 @@
       <el-col :span="24" class="list">
         <van-collapse v-model="openCollapse">
           <van-collapse-item :name="index" v-for="(item, index) in achieveList" :key="index">
-            <div slot="title" class="title">
-              <span class="name" @click="clickcds(item.id)">{{ item.stuname }}</span>
+            <div slot="title" class="title" @click="clickcds(item.id)">
+              <span class="name">{{ item.stuname }}</span>
             </div>
-            <van-row v-for="(tag, index) in lesson" :key="index">
+            <van-row v-for="(tag, index) in item.lesson" :key="index">
               <el-col :span="18">
                 <van-col :span="24" class="score"> 名称:{{ tag.name }} </van-col>
                 <van-col :span="24" class="score"> 作业分: {{ tag.score }}分</van-col>

+ 94 - 65
src/views/class/achieve.vue

@@ -69,6 +69,7 @@ export default {
     stuid: '',
     taskid: '',
     subname: '',
+    task: [],
   }),
   created() {
     this.search();
@@ -103,6 +104,58 @@ export default {
       else classid = this.user.classid;
       const res = await this.list({ classid });
       this.$set(this, `peaceAchieveList`, res.data);
+
+      let classsid = this.user.classid;
+      const result = await this.uploadtasklist({ classsid });
+
+      for (const accc of res.data) {
+        var arr = result.data.filter(item => item.studentid === accc.id);
+      }
+      // let lessons = [];
+      let lessone = [];
+      let stus = [];
+      for (const val of result.data) {
+        let newsid = val.lessonid;
+        let classid = this.user.classid;
+        //查询这个班的课程
+        const lessonInfo = await this.lessonlist({ classid });
+        for (const hic of lessonInfo.data) {
+          //过滤出有作业的科目
+          var fff = hic.lessons.filter(item => item._id === newsid);
+
+          for (const less of fff) {
+            this.$set(this, `subname`, less.subname);
+          }
+        }
+        val.subName = this.subname;
+        const stuInfo = await this.fet(val.studentid);
+        val.stuName = stuInfo.data.name;
+        //创建学生名字相关数组
+        let stu = [{ stuname: stuInfo.data.name, id: val.studentid, lesson: [] }];
+        //合并数组
+        stus = [...stu, ...stus];
+        //去掉重复数组对象
+        var appArray = _.uniqWith(stus, _.isEqual);
+        //合并数组
+        this.$set(this, `achieveList`, appArray);
+        let lessonss = [{ name: this.subname, id: val.studentid, taskid: val.id, score: val.score }];
+        lessone = [...lessonss, ...lessone];
+      }
+
+      for (const ss of appArray) {
+        console.log(ss.id);
+        console.log(lessone);
+        var vre = lessone.filter(item => item.id === ss.id);
+        console.log(vre);
+        ss.lesson = vre;
+      }
+      // for (const eee of appArray) {
+      //   eee.less = lessone;
+      //   var qq = eee.less.filter(item => item.id === eee.id);
+      console.log(appArray);
+      // }
+
+      this.$set(this, `task`, appArray);
     },
     // 学委上作业分+存储学生id
     clickAchieve({ id }) {
@@ -136,75 +189,51 @@ export default {
     },
     //  作业成绩列表
     async searchinfo({ ...info } = {}) {
-      let classid = this.user.classid;
-      const result = await this.uploadtasklist({ classid });
-      const res = await this.list({ classid });
-      for (const accc of res.data) {
-        var arr = result.data.filter(item => item.studentid === accc.id);
-      }
-      let lessons = [];
-      let stus = [];
-      for (const val of result.data) {
-        // const lessonInfo = await this.subjectinfo(val.lessonid);
-        let newsid = val.lessonid;
-        let classid = this.user.classid;
-        //查询这个班的课程
-        const lessonInfo = await this.lessonlist({ classid });
-
-        for (const hic of lessonInfo.data) {
-          //过滤出有作业的科目
-          var fff = hic.lessons.filter(item => item._id === newsid);
-          console.log(fff);
-          for (const less of fff) {
-            this.$set(this, `subname`, less.subname);
-          }
-        }
-        val.subName = this.subname;
-        const stuInfo = await this.fet(val.studentid);
-        console.log(stuInfo);
-
-        val.stuName = stuInfo.data.name;
-        //创建学生名字相关数组
-        let stu = [{ stuname: stuInfo.data.name, id: val.studentid }];
-        //合并数组
-        stus = [...stu, ...stus];
-
-        //去掉重复数组对象
-        var appArray = _.uniqWith(stus, _.isEqual);
-
-        //合并数组
-        let lesson = [{ name: this.subname, id: val.studentid }];
-        lessons = [...lesson, ...lessons];
-        // console.log(lessons);
-        console.log(appArray);
-
-        this.$set(this, `achieveList`, appArray);
-        // this.$set(this, `lesson`, lessons);
-      }
+      // let classid = this.user.classid;
+      // const result = await this.uploadtasklist({ classid });
+      // const res = await this.list({ classid });
+      // for (const accc of res.data) {
+      //   var arr = result.data.filter(item => item.studentid === accc.id);
+      // }
+      // // let lessons = [];
+      // let lessone = [];
+      // let stus = [];
+      // for (const val of result.data) {
+      //   let newsid = val.lessonid;
+      //   let classid = this.user.classid;
+      //   //查询这个班的课程
+      //   const lessonInfo = await this.lessonlist({ classid });
+      //   for (const hic of lessonInfo.data) {
+      //     //过滤出有作业的科目
+      //     var fff = hic.lessons.filter(item => item._id === newsid);
+      //     for (const less of fff) {
+      //       this.$set(this, `subname`, less.subname);
+      //     }
+      //   }
+      //   val.subName = this.subname;
+      //   const stuInfo = await this.fet(val.studentid);
+      //   val.stuName = stuInfo.data.name;
+      //   //创建学生名字相关数组
+      //   let stu = [{ stuname: stuInfo.data.name, id: val.studentid }];
+      //   //合并数组
+      //   stus = [...stu, ...stus];
+      //   //去掉重复数组对象
+      //   var appArray = _.uniqWith(stus, _.isEqual);
+      //   //合并数组
+      //   this.$set(this, `achieveList`, appArray);
+      //   let lessonss = [{ name: this.subname, id: val.studentid, taskid: val.id, score: val.score, less: [] }];
+      //   lessone = [...lessonss, ...lessone];
+      //   var appArrayss = _.uniqWith(lessone, _.isEqual);
+      //   this.$set(this, `task`, lessone);
+      //   console.log(appArrayss);
+      // }
     },
     //为了获取当前点击学生id和当前学生上传的作业
     async onsist({ id }) {
-      let classid = this.user.classid;
-      const result = await this.uploadtasklist({ classid });
-      const res = await this.list({ classid });
-      for (const accc of res.data) {
-        var arr = result.data.filter(item => item.studentid === accc.id);
-      }
-      let lessons = [];
-      for (const val of result.data) {
-        const lessonInfo = await this.subjectinfo(val.lessonid);
-        console.log(this.subname);
-        // val.subName = lessonInfo.data.name;
-        const stuInfo = await this.fet(val.studentid);
-        val.stuName = stuInfo.data.name;
-        let lesson = [{ name: this.subname, id: val.studentid, taskid: val.id, score: val.score }];
-        console.log(lesson);
+      console.log(id);
+
+      var arr = this.task.filter(item => item.id === id);
 
-        //合并数组
-        lessons = [...lesson, ...lessons];
-        //过滤掉与当前不同的学生id
-        var arr = lessons.filter(item => item.id === id);
-      }
       this.$set(this, `lesson`, arr);
     },
     async opensave({ id, name, score }) {