Skip to content

D
dd_school
Commit f61af9a3 by duxingshan
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
parents cc831b79 30159ab9
Showing with 120 additions and 46 deletions
ruoyi-ui/src/api/smartSchool/gradeWork/courseSelection/courseSelection.js
...@@ -18,3 +18,21 @@ export function courseSelectionSpringList(query) { ...@@ -18,3 +18,21 @@ export function courseSelectionSpringList(query) {
params: query, params: query,
}); });
} }
/** 夏季选课情况API **/
// 获取夏季选课列表
export function courseSelectionSummerList(query) {
return request({
url: "/curricula/student/listXj",
method: "get",
params: query,
});
}
/** 艺体选课情况API **/
// 获取艺体选课列表
export function courseSelectionArtList(query) {
return request({
url: "/curricula/student/listYt",
method: "get",
params: query,
});
}
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/artisticView/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="学生姓名" prop="userName"> <el-form-item label="学生姓名" prop="studentName">
<el-input v-model="queryParams.student" placeholder="请输入学生姓名" clearable/> <el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable />
</el-form-item> </el-form-item>
<el-form-item label="班级" prop="userName"> <el-form-item label="班级" prop="classId">
<el-select v-model="queryParams.class" placeholder="请选择班级"> <el-select v-model="queryParams.classId" placeholder="请选择学生班级" clearable>
<el-option v-for="(item,index) in classList" :key="index" <el-option v-for="(item, index) in classList" :key="index" :label="item.className"
:label="item" :value="item"></el-option> :value="item.classId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="已选课目" prop="userName"> <el-form-item label="已选课目" prop="selectedSubject">
<el-select v-model="queryParams.selectedSubjects" placeholder="请选择已选课目"> <el-select v-model="queryParams.selectedSubject" placeholder="请选择已选课目" clearable>
<el-option v-for="(item,index) in selectedSubjectsList" :key="index" <el-option v-for="(item, index) in dict.type.art_subject" :key="index" :label="item.label" :value="item.value">
:label="item" :value="item"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -23,53 +23,113 @@ ...@@ -23,53 +23,113 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="courseSelectionData" stripe> <el-table v-loading="loading" :data="courseSelectionData" stripe>
<el-table-column label="序号" type="index" width="55" align="center"/> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="班级" align="center" prop="orgname"/> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="学生姓名" align="center" prop="deviceNum"/> <el-table-column label="学生姓名" align="center" prop="studentName" />
<el-table-column label="学号" align="center" prop="userName"/> <el-table-column label="学号" align="center" prop="studentNumber" />
<el-table-column label="身份证号" align="center" prop="teacherCode"/> <el-table-column label="身份证号" align="center" prop="idCard" />
<el-table-column label="课程类型" align="center" prop="orgname"/> <el-table-column label="课程类型" align="center" prop="courseType">
<el-table-column label="选课时间" align="center" prop="orgname"/> <template slot-scope="{ row }">
<el-table-column label="选课状态" align="center" prop="orgname"/> <div>{{ selectDictLabel(dict.type.course_type, row.courseType) }}</div>
<el-table-column label="已选科目（排序）" align="center" prop="orgname"/> </template>
<el-table-column label="已选课程" align="center" prop="orgname"/> </el-table-column>
<el-table-column label="选课时间" align="center" prop="curriculaTime" />
<el-table-column label="选课状态" align="center" prop="curriculaState">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.curricula_state, row.curriculaState) }}</div>
</template>
</el-table-column>
<el-table-column label="已选科目" align="center" prop="selectedSubject">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.art_subject, row.selectedSubject) }}</div>
</template>
</el-table-column>
<el-table-column label="已选课程" align="center" prop="selectedCourse">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.section_type, row.selectedCourse) }}</div>
</template>
</el-table-column>
</el-table> </el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total" <pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/> :limit.sync="queryParams.pageSize" @pagination="getList" />
</div> </div>
</template> </template>
<script> <script>
import { classList } from "../../../../../api/smartSchool/gradeWork/courseSelection/taskPublishing";
import { courseSelectionArtList } from "../../../../../api/smartSchool/gradeWork/courseSelection/courseSelection";
export default { export default {
data(){ dicts: ['art_subject', 'curricula_state', 'course_type', 'section_type'],
data() {
return { return {
queryParams:{ queryParams: {
student:'', studentName: '',
class:'', classId: '',
selectedSubjects:'', selectedSubject: '',
curriculaId: '',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
selectedSubjectsList:[1,2,3], // 已选课目 classList: [], // 班级
classList:[1,2,3], // 班级 courseSelectionData: [],
courseSelectionData:[], loading: false,
loading:false, total: 0,
total:0, }
},
created() {
this.getList();
this.getClassList();
},
methods: {
// 获取列表
getList() {
this.queryParams.curriculaId = this.$route.query.id;
console.log('this.queryParams.curriculaId', this.queryParams.curriculaId);
courseSelectionArtList(this.queryParams).then(res => {
if (res.code == 200) {
this.courseSelectionData = res.rows;
console.log('this.courseSelectionData', this.courseSelectionData);
this.total = res.total;
this.loading = false;
} }
})
}, },
methods:{
//获取数据信息
getList(){
//获取班级下拉框数据
getClassList() {
let grade = this.$route.query.grade;
classList(grade).then(res => {
if (res.code == 200) {
this.classList = res.data;
}
})
}, },
//重置 //重置
resetQuery(){}, resetQuery() {
//导出 this.queryParams = {
exportRecord(){} studentName: '',
classId: '',
selectedSubject: '',
curriculaId: '',
pageNum: 1,
pageSize: 10,
} }
this.getList();
},
//导出
exportRecord() {
this.download('/curricula/student/exportYt', {
...this.queryParams
}, `学生艺体选课信息_${new Date().getTime()}.xlsx`)
}
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped></style>
</style>
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
...@@ -122,8 +122,6 @@ export default { ...@@ -122,8 +122,6 @@ export default {
// 记录条数 // 记录条数
total: 0, total: 0,
title: "", title: "",
// 记录列表
AppointmentList: [],
// 详情 // 详情
look: false, look: false,
// 日期范围 // 日期范围
...@@ -159,9 +157,6 @@ export default { ...@@ -159,9 +157,6 @@ export default {
.catch(err => { .catch(err => {
this.loading = false; this.loading = false;
}); });
this.title = "新增任务发布"; this.title = "新增任务发布";
}, },
// 成绩管理按钮 grade级部 ID任务ID // 成绩管理按钮 grade级部 ID任务ID
...@@ -316,13 +311,14 @@ export default { ...@@ -316,13 +311,14 @@ export default {
.itemBlock { .itemBlock {
width: 49%; width: 49%;
padding: 15px 20px 5px 20px; padding: 15px 20px 5px 20px;
margin:0 1.5% 1.5% 0; margin: 0 1.5% 1.5% 0;
border-radius: 20px; border-radius: 20px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
} }
.listBlock .itemBlock:nth-child(2n){ .listBlock .itemBlock:nth-child(2n){
margin-right: 0px!important; margin-right: 0px!important;
} }
.purpleBtn { .purpleBtn {
color: #FFFFFF; color: #FFFFFF;
background-color: #B66D93; background-color: #B66D93;
......
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