更新

src/layout/class/achieveList/homeworkAchiece.vue

@@ -68,6 +68,7 @@ export default {
       this.showPicker = false;
     },
     clickcds(id) {
+      console.log(id);
       this.$emit('submitss', { id: id });
     },
     clickBtn(taskid, name, score) {

src/layout/user/workList.vue

@@ -7,7 +7,7 @@
             <el-col :span="18">科目:{{ item.subname }}</el-col>
             <el-col :span="6" class="anniu">
               <el-button v-if="item.display === 'second'" type="primary" size="small" @click="clickBtn(item.subname, item.subid, item._id)">在线作答</el-button>
-              <el-button v-else type="primary" size="small" @click="clickzy(item.id)">上传作业</el-button>
+              <el-button v-else type="primary" size="small" @click="clickzy(item._id)">上传作业</el-button>
             </el-col>
           </el-col>
         </el-col>
@@ -33,6 +33,8 @@ export default {
       this.$router.push({ path: '/user/dati', query: { name: subname, id: subid, lessonid: _id } });
     },
     clickzy(_id) {
+      console.log(_id);
+
       this.$router.push({ path: '/user/chuanzuoye', query: { id: _id } });
     },
   },

src/views/class/achieve.vue

@@ -68,6 +68,7 @@ export default {
     // 修改
     stuid: '',
     taskid: '',
+    subname: '',
   }),
   created() {
     this.search();
@@ -144,9 +145,24 @@ export default {
       let lessons = [];
       let stus = [];
       for (const val of result.data) {
-        const lessonInfo = await this.subjectinfo(val.lessonid);
-        val.subName = lessonInfo.data.name;
+        // 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 }];
@@ -155,10 +171,13 @@ export default {
 
         //去掉重复数组对象
         var appArray = _.uniqWith(stus, _.isEqual);
+
         //合并数组
-        let lesson = [{ name: lessonInfo.data.name, id: val.studentid }];
+        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);
       }
@@ -174,10 +193,13 @@ export default {
       let lessons = [];
       for (const val of result.data) {
         const lessonInfo = await this.subjectinfo(val.lessonid);
-        val.subName = lessonInfo.data.name;
+        console.log(this.subname);
+        // val.subName = lessonInfo.data.name;
         const stuInfo = await this.fet(val.studentid);
         val.stuName = stuInfo.data.name;
-        let lesson = [{ name: lessonInfo.data.name, id: val.studentid, taskid: val.id, score: val.score }];
+        let lesson = [{ name: this.subname, id: val.studentid, taskid: val.id, score: val.score }];
+        console.log(lesson);
+
         //合并数组
         lessons = [...lesson, ...lessons];
         //过滤掉与当前不同的学生id

src/views/user/homework.vue

@@ -78,6 +78,7 @@ export default {
         for (const tyl of res.data) {
           var crr = tyl.lessons.filter(item => item.subid);
           this.$set(this, `workLists`, crr);
+          console.log(crr);
         }
 
         console.log(crr);