Skip to content

D
dd_school
Commit b6c8fe5b by zhaopanyu
Options

zpy 8.4

parents 07188d01 bcd083b0
Showing with 103 additions and 57 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/courseSelectionsituation/index.vue
......@@ -5,13 +5,13 @@
<el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable/>
</el-form-item>
<el-form-item label="课程类型" prop="userName">
<el-select v-model="queryParams.courseType" placeholder="请选择课程类型">
<el-select v-model="queryParams.courseType" placeholder="请选择课程类型" clearable>
<el-option v-for="(item,index) in dict.type.course_type" :key="index"
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="选课状态" prop="userName">
<el-select v-model="queryParams.curriculaState" placeholder="请选择选课状态">
<el-select v-model="queryParams.curriculaState" placeholder="请选择选课状态" clearable>
<el-option v-for="(item,index) in dict.type.curricula_state" :key="index"
:label="item.label" :value="item.value"></el-option>
</el-select>
......@@ -45,12 +45,12 @@
</el-table-column>
<el-table-column label="已选专业/课程" align="center" prop="orgname">
<!--
1春季：专业--专业类别 professional_category
1春季：专业--专业类别 specialty
2夏季：课程--学生选科 section_type
3艺体：科目+课程 -- 艺体科目 art_subject
-->
<template slot-scope="{ row }">
<div v-if="row.courseType == 1">{{ selectDictLabel(dict.type.professional_category,row.selectedMajorName) }}</div>
<div v-if="row.courseType == 1">{{ selectDictLabels(dict.type.specialty,row.selectedMajor) }}</div>
<div v-else-if="row.courseType == 2">{{ selectDictLabel(dict.type.section_type,row.selectedCourse) }}</div>
<div v-else-if="row.courseType == 3">
{{ selectDictLabel(dict.type.art_subject,row.selectedSubject) }}
......@@ -68,7 +68,7 @@
import {courseSelectionList} from "../../../../../api/smartSchool/gradeWork/courseSelection/courseSelection";
export default {
dicts: ['curricula_state','course_type','professional_category','section_type','art_subject'],
dicts: ['curricula_state','course_type','specialty','section_type','art_subject'],
data(){
return {
queryParams:{
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue
......@@ -5,13 +5,13 @@
<el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable/>
</el-form-item>
<el-form-item label="考试类型" prop="examType">
<el-select v-model="queryParams.examType" placeholder="请选择考试类型">
<el-select v-model="queryParams.examType" placeholder="请选择考试类型" clearable>
<el-option v-for="(item,index) in dict.type.exam_type" :key="index"
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="班级" prop="className">
<el-select v-model="queryParams.className" placeholder="请选择学生班级">
<el-select v-model="queryParams.classId" placeholder="请选择学生班级" clearable>
<el-option v-for="(item,index) in classList" :key="index"
:label="item.className" :value="item.classId"></el-option>
</el-select>
......@@ -273,7 +273,7 @@ export default {
curriculaId:'',
studentName:'',
examType:'',
className:'',
classId:'',
pageNum: 1,
pageSize: 10,
},
......@@ -338,7 +338,7 @@ export default {
curriculaId:'',
studentName:'',
examType:'',
className:'',
classId:'',
pageNum: 1,
pageSize: 10,
}
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/springView/index.vue
<template>
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form :model="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item prop="studentsName" label="学生姓名">
<el-input clearable v-model="queryForm.studentsName" placeholder="学生姓名"></el-input>
<el-input clearable v-model="queryForm.studentName" placeholder="学生姓名"></el-input>
</el-form-item>
<el-form-item prop="classId" label="班级">
<el-select v-model="queryForm.classId" placeholder="班级" clearable>
<el-option v-for="item in classList" :key="item.id" :label="item.className" :value="item.id">
</el-option>
<el-select v-model="queryForm.classId" placeholder="请选择学生班级" clearable>
<el-option v-for="(item,index) in classList" :key="index"
:label="item.className" :value="item.classId"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="majorId" label="已选专业">
<el-select v-model="queryForm.majorId" placeholder="已选专业" clearable>
<el-option v-for="item in majorList" :key="item.id" :label="item.majorName" :value="item.id">
<el-form-item prop="selectedMajor" label="已选专业">
<el-select v-model="queryForm.selectedMajor" placeholder="请选择学生已选专业" clearable>
<el-option v-for="(item,index) in dict.type.specialty" :key="index"
:label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
......@@ -24,15 +25,23 @@
</el-form>
<!-- 表单信息 -->
<el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }"
:data="studentsList" style="font-size: 14px" stripe>
<el-table-column label="班级" prop="bj" align="center" width="150px" />
<el-table-column label="学生姓名" prop="xsxm" align="center" width="150px" />
<el-table-column label="学号" prop="xh" align="center" />
<el-table-column label="身份证号" prop="sfzh" width="300px" align="center" />
<el-table-column label="课程类型" prop="kclx" align="center" />
<el-table-column label="选课时间" prop="xksj" align="center" />
<el-table-column label="已选专业" prop="yxzy" align="center" />
<el-table v-loading="loading" :data="studentsList" stripe>
<el-table-column label="班级" prop="className" align="center" width="150px" />
<el-table-column label="学生姓名" prop="studentName" align="center" width="150px" />
<el-table-column label="学号" prop="studentNumber" align="center" />
<el-table-column label="身份证号" prop="idCard" width="300px" align="center" />
<el-table-column label="课程类型" prop="courseType" align="center">
<!-- 1春季选课 2夏季选课 3艺体 -->
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.course_type,row.courseType) }}</div>
</template>
</el-table-column>
<el-table-column label="选课时间" prop="curriculaTime" align="center" />
<el-table-column label="已选专业" prop="selectedMajor" align="center">
<template slot-scope="{ row }">
<div>{{ selectDictLabels(dict.type.specialty,row.selectedMajor) }}</div>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" />
......@@ -41,19 +50,20 @@
</template>
<script>
import {
getksBudgetList,//查询科室预算填报项目明细列表
depBudget//查看详情
} from '@/api/smartSchool/logisticsManage/departmentBudgetview'
import { classList } from "../../../../../api/smartSchool/gradeWork/courseSelection/taskPublishing";
import { courseSelectionSpringList } from "../../../../../api/smartSchool/gradeWork/courseSelection/courseSelection";
export default {
name: "springView",
dicts: ['specialty','course_type'],
data() {
return {
majorList: [],
classList: [],
queryForm: { // 查询表单
studentsName: '',
curriculaId:'',
studentName: '',
classId: '',
selectedMajor: '',
pageNum: 1,
......@@ -65,52 +75,57 @@ export default {
}
},
created() {
mounted() {
this.getClassList()
this.getList();
},
methods: {
//获取班级下拉框数据
getClassList(){
let grade = this.$route.query.grade
classList(grade).then(res=>{
if(res.code == 200){
this.classList = res.data
}
})
},
// 获取列表
getList() {
this.loading = true
this.queryForm.curriculaId = this.$route.query.id
courseSelectionSpringList({...this.queryForm}).then(res=>{
if(res.code == 200){
this.studentsList = res.rows
this.total = res.total
this.loading = false
}
})
},
// 重置按钮
resetQuery() {
this.queryForm = {
curriculaId: '',
studentName: '',
classId: '',
selectedMajor: '',
pageNum: 1,
pageSize: 10
};
this.getList()
},
// 导出
handleExport() {
this.download('/departmentBudgetProjectmx/export', {
this.download('/curricula/student/exportCj', {
...this.queryParams
}, `科室预算查看_${Date.now()}.xlsx`)
}, `学生春季选课信息_${new Date().getTime()}.xlsx`)
}
}
}
</script>
<style lang="scss" scoped>
::v-deep .inline-table .cell {
padding: 0;
}
.title {
font-size: 20px;
text-align: center;
}
</style>
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
......@@ -46,7 +46,37 @@
<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="success" size="small" round @click="courseSelectionsituation(task.id)">选课情况</el-button>
<el-button type="warning" size="small" round @click="springView(task.id)">春季选课情况</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 class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button>
</div>
</div>
<div class="itemBlock" v-for="(task, index) in tasks" :key="index">
<!-- 任务详细信息 -->
<div class="task-info">
<div class="task-name">{{ task.taskName }}</div>
<!-- 右上角显示已选人数/全部人数 -->
<div class="task-count">
<div class="count">
{{ task.yxrs }}/{{ task.zrs }}
</div>
<div class="sun">已选人数/总人数</div>
</div>
</div>
<div class="task-level">
<span>级部：{{ task.grade }}</span>
<span>创建人：{{ task.createBy }}</span>
</div>
<div class="task-time">
<div>创建时间：{{ task.createTime }}</div>
</div>
<!-- 按钮 -->
<div class="task-buttons">
<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="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="danger" size="small" round @click="artisticView()">艺体选课情况</el-button>
<el-button class="purpleBtn" size="small" round @click="summerViewing()">夏季选课情况</el-button>
<el-button class="rowBtn" size="small" round @click="secondaryDivision()">夏季二次选课</el-button>
......@@ -178,12 +208,13 @@ export default {
}
});
},
// 春季选课按钮
springView(id) {
// 春季选课按钮 grade级部 ID任务ID
springView(id, grade) {
this.$router.push({
path: "/gradeWork/courseSelection/springView",
query: {
id
id,
grade
}
});
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment