zpy 8.4

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

@@ -31,7 +31,7 @@
                         <div class="count">
                         <div class="count">
                             {{ task.yxrs }}/{{ task.zrs }}
                             {{ task.yxrs }}/{{ task.zrs }}
                         </div>
                         </div>
-                        <div class="sun">已选人数/总人数</div>
+                        <div class="sun">总人数/已选人数</div>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="task-level">
                 <div class="task-level">
@@ -47,8 +47,10 @@
                     <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)">选课情况</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 @click="artisticView()">艺体选课情况</el-button>
-                    <el-button class="purpleBtn" size="small" round @click="summerViewing()">夏季选课情况</el-button>
+                    <el-button type="danger" size="small" round
+                        @click="artisticView(task.id, task.grade)">艺体选课情况</el-button>
+                    <el-button class="purpleBtn" size="small" round
+                        @click="summerViewing(task.id, task.grade)">夏季选课情况</el-button>
                     <el-button class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button>
                     <el-button class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button>
                 </div>
                 </div>
             </div>
             </div>
@@ -77,7 +79,7 @@
                     <el-row>
                     <el-row>
                         <el-col :span="16">
                         <el-col :span="16">
                             <el-form-item label="级部" prop="grade">
                             <el-form-item label="级部" prop="grade">
-                                <el-input v-model="form.grade" placeholder="请输入"></el-input>
+                                <el-input v-model="form.grade" placeholder="请输入" disabled></el-input>
                             </el-form-item>
                             </el-form-item>
                         </el-col>
                         </el-col>
                     </el-row>
                     </el-row>
@@ -180,6 +182,7 @@ export default {
         },
         },
         // 春季选课按钮 grade级部 ID任务ID
         // 春季选课按钮 grade级部 ID任务ID
         springView(id, grade) {
         springView(id, grade) {
+            console.log("grade", grade)
             this.$router.push({
             this.$router.push({
                 path: "/gradeWork/courseSelection/springView",
                 path: "/gradeWork/courseSelection/springView",
                 query: {
                 query: {
@@ -189,20 +192,23 @@ export default {
             });
             });
         },
         },
         //艺体选课按钮
         //艺体选课按钮
-        artisticView() {
+        artisticView(id, grade) {
             this.$router.push({
             this.$router.push({
                 path: "/gradeWork/courseSelection/artisticView",
                 path: "/gradeWork/courseSelection/artisticView",
                 query: {
                 query: {
-                    // id: this.task.id
+                    id,
+                    grade
                 }
                 }
             });
             });
         },
         },
         //夏季选课按钮
         //夏季选课按钮
-        summerViewing() {
+        summerViewing(id, grade) {
+            console.log("grade", grade)
             this.$router.push({
             this.$router.push({
                 path: "/gradeWork/courseSelection/summerViewing",
                 path: "/gradeWork/courseSelection/summerViewing",
                 query: {
                 query: {
-                    // id: this.task.id
+                    id,
+                    grade
                 }
                 }
             });
             });
         },
         },