p35z7urxv
/
pqa2fspn3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

完善课程管理页面

Browse Source
master
aiyadc 5 years ago
parent 1f5c6e5eb1 ef13714a95
commit 68335bcf5d
3 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File

23
element-vue/src/components/timeSelect.vue
Unescape View File

@ -2,7 +2,8 @@
<div> <div>
<el-row> <el-row>
<el-col :span="6" :offset="6"> <el-col :span="6" :offset="6">
学年：<el-select v-model="year" size="small" > 学年：
<el-select v-model="year" size="small">
<el-option <el-option
v-for="item in selectOptions1" v-for="item in selectOptions1"
:key="item.value" :key="item.value"
@ -14,7 +15,8 @@
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
学期：<el-select v-model="semester" size="small" > 学期：
<el-select v-model="semester" size="small">
<el-option <el-option
v-for="item in selectOptions2" v-for="item in selectOptions2"
:key="item.value" :key="item.value"
@ -35,29 +37,29 @@
name: "timeSelect", name: "timeSelect",
data() { data() {
return { return {
year:'1920', year: '2019',
semester:'2', semester: 2,
selectOptions1: [ selectOptions1: [
{ {
value:'1718', value: '2017',
label: '2017-2018年' label: '2017-2018年'
}, },
{ {
value:'1819', value: '2018',
label: '2018-2019年' label: '2018-2019年'
}, },
{ {
value:'1920', value: '2019',
label: '2019-2020年' label: '2019-2020年'
} }
], ],
selectOptions2: [ selectOptions2: [
{ {
value:'1', value: 1,
label: '第一学期' label: '第一学期'
}, },
{ {
value:'2', value: 2,
label: '第二学期' label: '第二学期'
} }
], ],
@ -69,10 +71,7 @@
}, },
selectSemester() { selectSemester() {
this.$emit('semester') this.$emit('semester')
}
}, },
mounted() {
console.log(this.year)
} }
} }
</script> </script>

35
element-vue/src/pages/teacher/courseManagement.vue
Unescape View File

@ -17,7 +17,7 @@
</div> </div>
<el-table :data="tableDataComputed" border> <el-table :data="tableDataComputed" border>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="课程编号" prop="uc_id"></el-table-column> <el-table-column label="课程编号" prop="ucId"></el-table-column>
<el-table-column label="课程名称" prop="name"></el-table-column> <el-table-column label="课程名称" prop="name"></el-table-column>
<el-table-column label="软件名称" prop="software"></el-table-column> <el-table-column label="软件名称" prop="software"></el-table-column>
<el-table-column label="授课班级" prop="classes"></el-table-column> <el-table-column label="授课班级" prop="classes"></el-table-column>
@ -135,25 +135,25 @@
}, },
selectOptions1: [ selectOptions1: [
{ {
value: '1718', value: '2017',
label: '2017-2018年' label: '2017-2018年'
}, },
{ {
value: '1819', value: '2018',
label: '2018-2019年' label: '2018-2019年'
}, },
{ {
value: '1920', value: '2019',
label: '2019-2020年' label: '2019-2020年'
} }
], ],
selectOptions2: [ selectOptions2: [
{ {
value: '1', value: 1,
label: '第一学期' label: '第一学期'
}, },
{ {
value: '2', value: 2,
label: '第二学期' label: '第二学期'
} }
], ],
@ -162,7 +162,7 @@
methods: { methods: {
//加载表格数据 //加载表格数据
async load() { async load() {
this.tableData = await get('lb/course/courseManagement') this.tableData = await get('lb/usercourse/findbyyearandsemester/'+this.$refs.timeSelect.year+'/'+this.$refs.timeSelect.semester)
}, },
selectYear(){ selectYear(){
this.tableData = get('lb/course/selectYear',this.$refs.timeSelect.year) this.tableData = get('lb/course/selectYear',this.$refs.timeSelect.year)
@ -184,11 +184,9 @@
this.courseForm = rowData this.courseForm = rowData
}, },
//删除课程 //删除课程
deleteCourse(rowData) { async deleteCourse(rowData) {
showDialog("确认要删除吗？", this) await showDialog("确认要删除吗？", this)
post('lb/user/deleteCourse', { post('lb/usercourse/deleteusercourse/'+rowData.ucId).then(() => {
uid: rowData.uc_id
}).then(() => {
showSuccess("删除成功", this) showSuccess("删除成功", this)
this.load() this.load()
}).catch(e => { }).catch(e => {
@ -204,14 +202,14 @@
await showDialog("确定要" + (this.edit ? '编辑' : '新增') + '吗？', this) await showDialog("确定要" + (this.edit ? '编辑' : '新增') + '吗？', this)
//编辑提交 //编辑提交
if (this.edit) { if (this.edit) {
await post('lb/usercourse/updatecourse', { await post('lb/usercourse/updateusercourse', {
year: this.courseForm.year, year: this.courseForm.year,
semester: this.courseForm.semester, semester: this.courseForm.semester,
uc_id: this.courseForm.uc_id, ucId: this.courseForm.ucId,
name: this.courseForm.name, name: this.courseForm.name,
software: this.courseForm.software, software: this.courseForm.software,
classes: this.courseForm.classes, classes: this.courseForm.classes,
population: this.courseForm.population, population: parseInt(this.courseForm.population),
remind: this.courseForm.remind, remind: this.courseForm.remind,
isHaveDocuments: this.courseForm.isHaveDocuments isHaveDocuments: this.courseForm.isHaveDocuments
}).catch(async e => { }).catch(async e => {
@ -230,7 +228,7 @@
name: this.courseForm.name, name: this.courseForm.name,
software: this.courseForm.software, software: this.courseForm.software,
classes: this.courseForm.classes, classes: this.courseForm.classes,
population: this.courseForm.population, population: parseInt(this.courseForm.population),
remind: this.courseForm.remind, remind: this.courseForm.remind,
isHaveDocuments: this.courseForm.isHaveDocuments isHaveDocuments: this.courseForm.isHaveDocuments
}).catch(async e => { }).catch(async e => {
@ -255,14 +253,9 @@
computed: { computed: {
tableDataComputed() { tableDataComputed() {
return this.tableData.filter(data => !this.search return this.tableData.filter(data => !this.search
|| data.uc_id.toLowerCase().includes(this.search.toLowerCase())
|| data.u_id.toLowerCase().includes(this.search.toLowerCase())
|| data.name.toLowerCase().includes(this.search.toLowerCase()) || data.name.toLowerCase().includes(this.search.toLowerCase())
|| data.software.toLowerCase().includes(this.search.toLowerCase()) || data.software.toLowerCase().includes(this.search.toLowerCase())
|| data.classes.toLowerCase().includes(this.search.toLowerCase()) || data.classes.toLowerCase().includes(this.search.toLowerCase())
|| data.population.toLowerCase().includes(this.search.toLowerCase())
|| data.remind.toLowerCase().includes(this.search.toLowerCase())
|| data.isHaveDocuments.toLowerCase().includes(this.search.toLowerCase())
) )
} }
}, },

26
java/src/main/java/com/hzu/bookingsystem/controller/UserCourseController.java
Unescape View File

@ -18,6 +18,9 @@ public class UserCourseController {
@Autowired @Autowired
private UserCourseService usercourseService; private UserCourseService usercourseService;
@Autowired
private UserController userController;
// 根据id查看课程记录 // 根据id查看课程记录
@GetMapping(value = "/findusercourse/{uc_id}") @GetMapping(value = "/findusercourse/{uc_id}")
public ResultVO<Map<String, UserCourseBean>> FindUserCourseId(@PathVariable("uc_id") Integer uc_id) { public ResultVO<Map<String, UserCourseBean>> FindUserCourseId(@PathVariable("uc_id") Integer uc_id) {
@ -39,13 +42,26 @@ public class UserCourseController {
return ResultVOUtil.success(usercourselist); return ResultVOUtil.success(usercourselist);
} }
// author 吴志岳
// 根据用户登录id和学年，学期查询课程
@GetMapping(value = "/findbyyearandsemester/{year}/{semester}")
public ResultVO<Map<String, UserCourseBean>> findUidandYearandSemester(@PathVariable("year") String year,@PathVariable("semester") Integer semester,HttpServletRequest request) {
List<UserCourseBean> usercourselist = usercourseService.findAllByUidAndYearAndSemester(userController.getUIdByCookie(request),year,semester) ;
return ResultVOUtil.success(usercourselist);
}
// 增加课程记录 // 增加课程记录
@PostMapping(value = "/addusercourse", consumes = "application/json") @PostMapping(value = "/addusercourse", consumes = "application/json")
public ResultVO addUserCourse(@RequestBody Map<String,Object> map) { public ResultVO addUserCourse(@RequestBody Map<String,Object> map,HttpServletRequest request) {
// 1.转换对象 // 1.转换对象
UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class); UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class);
// 2.插入
// author 吴志岳
// 2.设置用户ID
usercourse.setUId(userController.getUIdByCookie(request));
// 3.插入
usercourseService.add(usercourse); usercourseService.add(usercourse);
return ResultVOUtil.success(); return ResultVOUtil.success();
} }
@ -56,12 +72,16 @@ public class UserCourseController {
// 转换对象 // 转换对象
UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class); UserCourseBean usercourse = (UserCourseBean) Map2Object.map2Object(map,UserCourseBean.class);
// author 吴志岳
// 2.设置用户ID
usercourse.setUId(userController.getUIdByCookie(request));
UserCourseBean usercoursenew = usercourseService.update(usercourse) ; UserCourseBean usercoursenew = usercourseService.update(usercourse) ;
return ResultVOUtil.success(usercoursenew); return ResultVOUtil.success(usercoursenew);
} }
// 通过uc_id删除记录 // 通过uc_id删除记录
@PostMapping(value = "/deleteusercourse/{uc_id}", consumes = "application/json") @PostMapping(value = "/deleteusercourse/{uc_id}")
public ResultVO deleteUsercourse(@PathVariable("uc_id") Integer uc_id){ public ResultVO deleteUsercourse(@PathVariable("uc_id") Integer uc_id){
// 查找该用户看是否存在 // 查找该用户看是否存在
UserCourseBean usercourse = usercourseService.findById(uc_id); UserCourseBean usercourse = usercourseService.findById(uc_id);

Write Preview
Loading…
Cancel
Save