Skip to content

D
dd_school
Commit 30159ab9 by zhaopanyu
Options

zpy 8.4

parent 660495f8
Showing with 221 additions and 164 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,
} }
}, },
methods:{ created() {
//获取数据信息 this.getList();
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;
}
})
},
//获取班级下拉框数据
getClassList() {
let grade = this.$route.query.grade;
classList(grade).then(res => {
if (res.code == 200) {
this.classList = res.data;
}
})
}, },
//重置 //重置
resetQuery(){}, resetQuery() {
this.queryParams = {
studentName: '',
classId: '',
selectedSubject: '',
curriculaId: '',
pageNum: 1,
pageSize: 10,
}
this.getList();
},
//导出 //导出
exportRecord(){} 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/summerViewing/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px"> <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item prop="studentsName" label="学生姓名"> <el-form-item prop="studentName" label="学生姓名">
<el-input clearable v-model="queryForm.studentsName" placeholder="学生姓名" <el-input clearable v-model="queryForm.studentName" placeholder="学生姓名"></el-input>
@keyup.enter.native="handleQuery"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="classId" label="班级"> <el-form-item prop="classId" label="班级">
<el-select v-model="queryForm.classId" placeholder="班级" clearable> <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 v-for="(item, index) in classList" :key="index" :label="item.className"
</el-option> :value="item.classId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="majorId" label="已选课程"> <el-form-item prop="selectedCourse" label="已选课程">
<el-select v-model="queryForm.majorId" placeholder="已选课程" clearable> <el-select v-model="queryForm.selectedCourse" placeholder="请选择学生已选专业" clearable>
<el-option v-for="item in majorList" :key="item.id" :label="item.majorName" :value="item.id"> <el-option v-for="(item, index) in dict.type.section_type" :key="index" :label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-user" size="mini" @click="shiftRules">分班规则</el-button> <el-button icon="el-icon-user" size="mini" @click="shiftRules">分班规则</el-button>
<el-button type="warning" icon="el-icon-upload2" size="mini" @click="handleExport">导出</el-button> <el-button type="warning" icon="el-icon-upload2" size="mini" @click="handleExport">导出</el-button>
...@@ -27,13 +27,18 @@ ...@@ -27,13 +27,18 @@
<!-- 表单信息 --> <!-- 表单信息 -->
<el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }" <el-table border v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }"
:data="studentsList" style="font-size: 14px" stripe> :data="studentsList" style="font-size: 14px" stripe>
<el-table-column label="班级" prop="bj" align="center" width="150px" /> <el-table-column label="班级" prop="className" align="center" width="150px" />
<el-table-column label="学生姓名" prop="xsxm" align="center" width="150px" /> <el-table-column label="学生姓名" prop="studentName" align="center" width="150px" />
<el-table-column label="学号" prop="xh" align="center" /> <el-table-column label="学号" prop="studentNumber" align="center" />
<el-table-column label="身份证号" prop="sfzh" width="300px" align="center" /> <el-table-column label="身份证号" prop="idCard" width="300px" align="center" />
<el-table-column label="成绩" prop="cj" align="center" /> <el-table-column label="成绩" prop="courseScore" align="center" />
<el-table-column label="已选课程" prop="yxkc" align="center" /> <el-table-column label="已选课程" prop="selectedCourse" align="center">
<el-table-column label="所分班级" prop="sfbj" align="center" /> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.section_type, row.selectedCourse) }}</div>
</template>
</el-table-column>
<el-table-column label="所分班级" prop="divisionClassesName" align="center" />
</el-table> </el-table>
<!-- 分班规则弹窗 --> <!-- 分班规则弹窗 -->
...@@ -50,28 +55,30 @@ ...@@ -50,28 +55,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>
<!-- :label="` ${postForm.yxkc}`" --> <el-col :span="8" v-for="course in selectedCourse" :key="course">
<el-col :span="8"> <el-form-item :prop="`yxkc${course}`" :label="`selectedCourse ${course}`"
<el-form-item prop="yxkc" label="史政地" :style="{ width: '100%' }"> :style="{ width: '100%' }">
<el-input v-model="postForm.classCount" placeholder="班级数量"></el-input> <el-input v-model="postForm[`classCount${course}`]" placeholder="班级数量"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5" v-for="course in selectedCourse" :key="course">
<el-input v-model="postForm.studentCount" placeholder="每班人数"></el-input> <el-input v-model="postForm[`studentCount${course}`]" placeholder="每班人数"></el-input>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row>
<!-- :label="` ${postForm.yxkc}`" --> <!-- <div> -->
<el-col :span="8"> <!-- <el-col :span="8" v-for="course in selectedCourse" :key="course.id"> -->
<el-form-item prop="yxkc" label="物理化" :style="{ width: '100%' }"> <!-- 标签文本 -->
<el-input v-model="postForm.classCount" placeholder="班级数量"></el-input> <!-- <el-form-item :prop="course.id" :label="course.name" :style="{ width: '100%' }"> -->
</el-form-item> <!-- 第一个输入框 -->
</el-col> <!-- <el-input v-model="postForm[course.id].classCount" placeholder="班级数量"></el-input> -->
<el-col :span="5"> <!-- </el-form-item> -->
<el-input v-model="postForm.studentCount" placeholder="每班人数"></el-input> <!-- 第二个输入框 -->
</el-col> <!-- <el-input v-model="postForm[course.id].studentCount" placeholder="每班人数"></el-input> -->
</el-row> <!-- </el-col> -->
<!-- </div> -->
</div> </div>
</el-form> </el-form>
...@@ -82,90 +89,67 @@ ...@@ -82,90 +89,67 @@
</el-dialog> </el-dialog>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" /> --> @pagination="getList" />
</div> </div>
</template> </template>
<script> <script>
import { import { classList } from "../../../../../api/smartSchool/gradeWork/courseSelection/taskPublishing";
getksBudgetList,//查询科室预算填报项目明细列表 import { courseSelectionSummerList } from "../../../../../api/smartSchool/gradeWork/courseSelection/courseSelection";
depBudget//查看详情
} from '@/api/smartSchool/logisticsManage/departmentBudgetview'
export default { export default {
name: "springView", name: "springView",
dicts: ['section_type'],
data() { data() {
return { return {
// 已选课程 // selectedCourse: [
yxkc: "", // {
//人数 // course: {
rs: '', // id: 1,
majorList: [], // name: '语文',
// classCount: '22',
// studentCount: '12'
// },
// course: {
// id: 2,
// name: '语文'
// },
// course: {
// id: 3,
// name: '语文'
// },
// }
// ],
classList: [], classList: [],
// 查询表单 // 查询表单
queryForm: { queryForm: {
curriculaId: '',
studentsName: '', studentsName: '',
classId: '', classId: '',
majorId: '', selectedCourse: '',
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}, },
form: { form: {
rwfb: '',
sj: '',
jb: ''
}, },
// 遮罩层 // 遮罩层
loading: false, loading: false,
total: 0, total: 0,
// 信息列表 // 信息列表
studentsList: [ studentsList: [],
{
id: 1,
bj: '一班',
xsxm: '张三',
xh: '2018001',
sfzh: '123456789012345678',
cj: '500',
yxkc: '物理化',
sfbj: '物理化一班'
},
{
id: 2,
bj: '一班',
xsxm: '张三',
xh: '2018001',
sfzh: '123456789012345678',
cj: '500',
yxkc: '物理化',
sfbj: '物理化一班'
},
{
id: 3,
bj: '一班',
xsxm: '张三',
xh: '2018001',
sfzh: '123456789012345678',
cj: '500',
yxkc: '物理化',
sfbj: '物理化一班'
}
],
// 新增/编辑表单 // 新增/编辑表单
postForm: { postForm: {
yxkc: '物理化',
}, },
fbgz: '', fbgz: '',
// 查看表格
lookTable: [],
options: [],
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查看弹窗
openLook: false,
// 校验规则 // 校验规则
rules: { rules: {
...@@ -174,64 +158,60 @@ export default { ...@@ -174,64 +158,60 @@ export default {
title: '', title: '',
// 是否禁用删除按钮--项目明细 // 是否禁用删除按钮--项目明细
multiple: false, multiple: false,
// 选中数据的值数组
selectItems: [],
// 科室列表
deptOptions: [],
} }
}, },
created() { created() {
// this.getList(); this.getList();
this.getClassList();
}, },
methods: { methods: {
// 获取列表
getList() {
this.queryForm.curriculaId = this.$route.query.id;
console.log('this.queryForm.curriculaId', this.queryForm.curriculaId);
courseSelectionSummerList(this.queryForm).then(res => {
if (res.code == 200) {
this.studentsList = res.rows;
this.total = res.total;
this.loading = false;
}
})
},
//获取班级下拉框数据
getClassList() {
// 获取列表 let grade = this.$route.query.grade;
// getList() { classList(grade).then(res => {
// getksBudgetList(this.queryForm).then(response => { if (res.code == 200) {
// this.loading = false; this.classList = res.data;
// this.studentsList = response.rows; }
// this.postForm.yxkc = response.rows.yxkc; })
// console.log(111, response.rows); },
// this.total = response.total;
// }).catch(err => {
// this.loading = false;
// })
// },
// 分班规则 // 分班规则
shiftRules() { shiftRules() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "分班规则"; this.title = "分班规则";
}, },
// 搜索按钮
handleQuery() {
this.getList();
},
// 重置按钮 // 重置按钮
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.getList();
}, },
// 重置 // 重置
reset() { reset() {
this.postForm = { this.postForm = {
curriculaId: '',
} }
this.resetForm('postForm'); this.resetForm('postForm');
}, },
...@@ -239,15 +219,14 @@ export default { ...@@ -239,15 +219,14 @@ export default {
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
this.openLook = false;
this.reset(); this.reset();
this.resetForm('postForm'); this.resetForm('postForm');
}, },
// 导出 // 导出
handleExport() { handleExport() {
this.download('/departmentBudgetProjectmx/export', { this.download('/curricula/student/exportXj', {
...this.queryParams ...this.queryForm,
}, `科室预算查看_${Date.now()}.xlsx`) }, `学生夏季选课查看_${Date.now()}.xlsx`)
}, },
// 分班按钮 // 分班按钮
submitForm() { submitForm() {
...@@ -255,7 +234,7 @@ export default { ...@@ -255,7 +234,7 @@ export default {
if (valid) { if (valid) {
submitRepairs(this.form) submitRepairs(this.form)
.then((response) => { .then((response) => {
this.$modal.msgSuccess("反馈成功"); this.$modal.msgSuccess("分班成功");
this.openfk = false; this.openfk = false;
this.formfk.maintainResult = ''; this.formfk.maintainResult = '';
this.getList(); this.getList();
......
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