zhaichao/education
1
0
Fork 0
forked from liweijie/education
Code Pull Requests Activity

1、学员信息管理成绩查看，只显示课程编号改为显示课程名称和课程编号；

Browse Source 
2、机关教学日志日期显示格式修改
This commit is contained in:
liweijie
2026-09-23 17:43:40 +08:00
parent 07ec44e9d4
commit 06c057e490
7 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java
+2 -1
View File
@@ -520,9 +520,10 @@ public class StudentRecordsController {
@RequestParam(required = false) String kcbh,
@RequestParam(required = false) String xydbh,
@RequestParam(required = false) String xh,
@RequestParam(required = false) String xybh,
@RequestParam(required = false) Integer nd) {
return Result.success(studentRecordsService.pageCourseGrades(
new PageQuery(pageNum, pageSize), kcbh, xydbh, xh, nd));
new PageQuery(pageNum, pageSize), kcbh, xydbh, xh, xybh, nd));
}
/**
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java
+2 -2
View File
@@ -56,8 +56,8 @@ public interface StudentRecordsService {
// ========== 学员课程成绩查询 ==========
/** 分页查询学员的课程成绩列表（按课程编号、学员队编号、学号、年度筛选） */
PageResult<XYKCCJ> pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, Integer nd);
/** 分页查询学员的课程成绩列表（按课程编号、学员队编号、学号、学员编号、年度筛选） */
PageResult<XYKCCJ> pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, String xybh, Integer nd);
/** 分页查询学员的课程过程成绩列表（按学员编号、年度筛选，年度为空默认最新年度） */
PageResult<XYKCGCCJ> pageCourseProcessGrades(PageQuery query, String xybh, Integer nd);
backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java
+2 -2
View File
@@ -379,8 +379,8 @@ public class StudentRecordsServiceImpl implements StudentRecordsService {
// ========== 学员课程成绩查询 ==========
@Override
public PageResult<XYKCCJ> pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, Integer nd) {
String selfStudentId = null;
public PageResult<XYKCCJ> pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, String xybh, Integer nd) {
String selfStudentId = trimToNull(xybh);
if (jwglRoleHelper.isStudent()) {
selfStudentId = jwglRoleHelper.requireStudentId();
}
frontend/src/views/student/studentInfo/index.vue
+25 -3
View File
@@ -284,7 +284,9 @@
<el-table v-loading="gradesLoading" :data="filteredGradesData" stripe border max-height="420">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="nd" label="年度" width="85" align="center" />
<el-table-column prop="kmbh" label="科目编号" min-width="120" align="center" show-overflow-tooltip />
<el-table-column label="科目" min-width="160" align="center" show-overflow-tooltip>
<template slot-scope="{ row }">{{ subjectLabel(row.kmbh) }}</template>
</el-table-column>
<el-table-column prop="klx" label="课类型" width="90" align="center" />
<el-table-column prop="kscj" label="考试成绩" width="90" align="center" />
<el-table-column prop="pscj" label="平时成绩" width="90" align="center" />
@@ -302,7 +304,9 @@
<el-table v-loading="gradesLoading" :data="filteredProcessGradesData" stripe border max-height="420">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="nd" label="年度" width="85" align="center" />
<el-table-column prop="kmbh" label="科目编号" min-width="120" align="center" show-overflow-tooltip />
<el-table-column label="科目" min-width="160" align="center" show-overflow-tooltip>
<template slot-scope="{ row }">{{ subjectLabel(row.kmbh) }}</template>
</el-table-column>
<el-table-column prop="klx" label="课类型" width="90" align="center" />
<el-table-column prop="yscj" label="原始成绩" width="100" align="center" />
<el-table-column prop="zzcj" label="最终成绩" width="90" align="center" />
@@ -327,6 +331,7 @@
import {
listStudentRecord,
listPeriodOptions,
listKbOptions,
getStudentRecord,
addStudentRecord,
updateStudentRecord,
@@ -427,6 +432,8 @@ export default {
submitting: false,
periodOptions: [],
periodOptionsLoaded: false,
kbOptions: [],
kbOptionsLoaded: false,
teamOptions: [],
teamOptionsLoaded: false,
formData: this.createEmptyForm(),
@@ -575,7 +582,7 @@ export default {
createEmptyForm() {
return {
bh: '', xh: '', xm: '', xydqbh: '', zjhm: '', zzmm: '', xb: '', csrq: '', mz: '', jg: '',
whcd: '', xylb: '', ssjq: '', gfs: '', txzt: '', ljzt: '', fbzt: '', yxckcj: '', dqbzbh: '', yzc: '',
whcd: '', xylb: '', ssjq: '', gfs: '', txzt: '', ljzt: '', fbzt: '', yxckcj: '1', dqbzbh: '', yzc: '',
jrzjlx: '', sfzh: '', lxdh: '', txdz: '', bz: '', dtsj: ''
}
},
@@ -646,6 +653,20 @@ export default {
}).catch(() => {})
},
loadKbOptions() {
if (this.kbOptionsLoaded) return
listKbOptions().then(res => {
this.kbOptions = (res && res.data) || []
this.kbOptionsLoaded = true
}).catch(() => {})
},
/** 科目列：显示「名称（编号）」，查不到名称时只显示编号 */
subjectLabel(kmbh) {
const hit = this.kbOptions.find(item => String(item.kbh) === String(kmbh))
return hit ? `${hit.kmc}（${kmbh}）` : (kmbh || '')
},
loadTeamOptions() {
if (this.teamOptionsLoaded) return
listTeam({ pageNum: 1, pageSize: 1000 }).then(res => {
@@ -739,6 +760,7 @@ export default {
this.gradesTab = 'grades'
this.gradesVisible = true
this.gradesLoading = true
this.loadKbOptions()
const emptyResponse = { data: { records: [] } }
const query = { pageNum: 1, pageSize: 1000, xybh: this.currentBh }
frontend/src/views/teachingLog/organLog/components/auditedView.vue
+1 -1
View File
@@ -222,7 +222,7 @@ export default {
/** 组件方法：包一层全局 formatDate，供模板调用 */
formatDate(val) {
return formatDate(val)
return (formatDate(val) || '').split(' ')[0]
},
/** 根据已填写的查询值构建实际查询参数 */
frontend/src/views/teachingLog/organLog/components/logView.vue
+1 -1
View File
@@ -259,7 +259,7 @@ export default {
},
methods: {
formatDate(val) {
return formatDate(val)
return (formatDate(val) || '').split(' ')[0]
},
handleSelectionChange(rows) {
frontend/src/views/teachingLog/organLog/components/reportedView.vue
+1 -1
View File
@@ -247,7 +247,7 @@ export default {
/** 组件方法：包一层全局 formatDate，供模板调用 */
formatDate(val) {
return formatDate(val)
return (formatDate(val) || '').split(' ')[0]
},
/** 根据已填写的查询值构建实际查询参数 */