1、修改GIT覆盖部分

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/artisticView/index.vue

@@ -85,11 +85,9 @@ export default {
     // 获取列表
     // 获取列表
     getList() {
     getList() {
       this.queryParams.curriculaId = this.$route.query.id;
       this.queryParams.curriculaId = this.$route.query.id;
-      console.log('this.queryParams.curriculaId', this.queryParams.curriculaId);
       courseSelectionArtList(this.queryParams).then(res => {
       courseSelectionArtList(this.queryParams).then(res => {
         if (res.code == 200) {
         if (res.code == 200) {
           this.courseSelectionData = res.rows;
           this.courseSelectionData = res.rows;
-          console.log('this.courseSelectionData', this.courseSelectionData);
           this.total = res.total;
           this.total = res.total;
           this.loading = false;
           this.loading = false;
         }
         }
@@ -106,8 +104,9 @@ export default {
         }
         }
       })
       })
     },
     },
+
     //重置
     //重置
-    resetQuery() { 
+    resetQuery() {
       this.queryParams = {
       this.queryParams = {
         studentName: '',
         studentName: '',
         classId: '',
         classId: '',
@@ -117,16 +116,15 @@ export default {
         pageSize: 10,
         pageSize: 10,
       }
       }
       this.getList();
       this.getList();
-
-
-
     },
     },
+
     //导出
     //导出
     exportRecord() {
     exportRecord() {
       this.download('/curricula/student/exportYt', {
       this.download('/curricula/student/exportYt', {
         ...this.queryParams
         ...this.queryParams
       }, `学生艺体选课信息_${new Date().getTime()}.xlsx`)
       }, `学生艺体选课信息_${new Date().getTime()}.xlsx`)
     }
     }
+
   }
   }
 }
 }
 
 

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/summerViewing/index.vue

@@ -170,7 +170,6 @@ export default {
         // 获取列表
         // 获取列表
         getList() {
         getList() {
             this.queryForm.curriculaId = this.$route.query.id;
             this.queryForm.curriculaId = this.$route.query.id;
-            console.log('this.queryForm.curriculaId', this.queryForm.curriculaId);
             courseSelectionSummerList(this.queryForm).then(res => {
             courseSelectionSummerList(this.queryForm).then(res => {
                 if (res.code == 200) {
                 if (res.code == 200) {
                     this.studentsList = res.rows;
                     this.studentsList = res.rows;

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue

@@ -45,7 +45,7 @@
                 <div class="task-buttons">
                 <div class="task-buttons">
                     <el-button size="mini" icon="el-icon-edit" round @click="handleUpdate(task)">修改</el-button>
                     <el-button size="mini" icon="el-icon-edit" round @click="handleUpdate(task)">修改</el-button>
                     <el-button type="primary" size="small" round @click="performance(task.id, task.grade)">成绩管理</el-button>
                     <el-button type="primary" size="small" round @click="performance(task.id, task.grade)">成绩管理</el-button>
-                    <el-button type="success" size="small" round @click="courseSelectionsituation(task.id)">选课情况</el-button>
+                    <el-button type="success" size="small" round @click="courseSelectionsituation(task.id,task.yxrs,task.zrs)">选课情况</el-button>
                     <el-button type="warning" size="small" round @click="springView(task.id, task.grade)">春季选课情况</el-button>
                     <el-button type="warning" size="small" round @click="springView(task.id, task.grade)">春季选课情况</el-button>
                     <el-button type="danger" size="small" round
                     <el-button type="danger" size="small" round
                         @click="artisticView(task.id, task.grade)">艺体选课情况</el-button>
                         @click="artisticView(task.id, task.grade)">艺体选课情况</el-button>