|
@@ -39,22 +39,22 @@
|
|
|
<el-table v-loading="xloading" :data="tableData" border>
|
|
<el-table v-loading="xloading" :data="tableData" border>
|
|
|
<el-table-column prop="gOriented" width="350" label="导向目标">
|
|
<el-table-column prop="gOriented" width="350" label="导向目标">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="pScore" label="P(问题定义)">
|
|
|
|
|
|
|
+ <el-table-column prop="pScore" label="P(问题定义)(得分/满分)">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.pScore==null?0:scope.row.pScore}}/{{stepscore['P']}}</span>
|
|
<span>{{scope.row.pScore==null?0:scope.row.pScore}}/{{stepscore['P']}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="sScore" label="S(系统拆解)">
|
|
|
|
|
|
|
+ <el-table-column prop="sScore" label="S(系统拆解)(得分/满分)">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.sScore==null?0:scope.row.sScore}}/{{stepscore['S']}}</span>
|
|
<span>{{scope.row.sScore==null?0:scope.row.sScore}}/{{stepscore['S']}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="rScore" label="R(结果整合)">
|
|
|
|
|
|
|
+ <el-table-column prop="rScore" label="R(结果整合)(得分/满分)">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.rScore==null?0:scope.row.rScore}}/{{stepscore['R']}}</span>
|
|
<span>{{scope.row.rScore==null?0:scope.row.rScore}}/{{stepscore['R']}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="eScore" label="E(评估方法)">
|
|
|
|
|
|
|
+ <el-table-column prop="eScore" label="E(评估方法)(得分/满分)">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.eScore==null?0:scope.row.eScore}}/{{stepscore['E']}}</span>
|
|
<span>{{scope.row.eScore==null?0:scope.row.eScore}}/{{stepscore['E']}}</span>
|
|
|
</template>
|
|
</template>
|
|
@@ -159,7 +159,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div v-else class="no-courses flex-item">
|
|
<div v-else class="no-courses flex-item">
|
|
|
- <el-empty description="该科目下暂无课程">
|
|
|
|
|
|
|
+ <el-empty description="该科目下暂无课程">
|
|
|
</el-empty>
|
|
</el-empty>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -311,7 +311,7 @@ export default {
|
|
|
return this.axios.get(this.$httpApi.httpUrl('/student/gradeInfo/list'), {
|
|
return this.axios.get(this.$httpApi.httpUrl('/student/gradeInfo/list'), {
|
|
|
params: {
|
|
params: {
|
|
|
pageNumber: 0,
|
|
pageNumber: 0,
|
|
|
- pageSize: 100,
|
|
|
|
|
|
|
+ pageSize: 100,
|
|
|
schoolType: stageId
|
|
schoolType: stageId
|
|
|
}
|
|
}
|
|
|
}).then(response => {
|
|
}).then(response => {
|
|
@@ -357,7 +357,7 @@ export default {
|
|
|
async loadStages() {
|
|
async loadStages() {
|
|
|
try {
|
|
try {
|
|
|
// 使用已获取的learnInfo数据作为阶段数据
|
|
// 使用已获取的learnInfo数据作为阶段数据
|
|
|
- await this.getLearnList()
|
|
|
|
|
|
|
+ await this.getLearnList()
|
|
|
if (this.learnInfo && this.learnInfo.length > 0) {
|
|
if (this.learnInfo && this.learnInfo.length > 0) {
|
|
|
// 假设learnInfo中的数据结构包含id和name字段
|
|
// 假设learnInfo中的数据结构包含id和name字段
|
|
|
return this.learnInfo.map(item => ({
|
|
return this.learnInfo.map(item => ({
|
|
@@ -366,7 +366,7 @@ export default {
|
|
|
leaf: false
|
|
leaf: false
|
|
|
}));
|
|
}));
|
|
|
} else {
|
|
} else {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return [
|
|
return [
|
|
|
{ id: 1, name: '本科', leaf: false },
|
|
{ id: 1, name: '本科', leaf: false },
|
|
|
{ id: 2, name: '研究生', leaf: false },
|
|
{ id: 2, name: '研究生', leaf: false },
|
|
@@ -391,7 +391,7 @@ export default {
|
|
|
// 使用已获取的gradeInfo数据作为年级数据
|
|
// 使用已获取的gradeInfo数据作为年级数据
|
|
|
|
|
|
|
|
await this.getGradeList(stageId)
|
|
await this.getGradeList(stageId)
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if ((this.gradeInfo && this.gradeInfo.length > 0)) {
|
|
if ((this.gradeInfo && this.gradeInfo.length > 0)) {
|
|
|
// 过滤出对应阶段的年级数据
|
|
// 过滤出对应阶段的年级数据
|
|
|
const filteredGrades = this.gradeInfo.filter(item => {
|
|
const filteredGrades = this.gradeInfo.filter(item => {
|
|
@@ -405,7 +405,7 @@ export default {
|
|
|
name: item.name,
|
|
name: item.name,
|
|
|
leaf: false
|
|
leaf: false
|
|
|
}));
|
|
}));
|
|
|
- } else {
|
|
|
|
|
|
|
+ } else {
|
|
|
// 如果gradeInfo为空,使用默认数据
|
|
// 如果gradeInfo为空,使用默认数据
|
|
|
const grades = {
|
|
const grades = {
|
|
|
1: [ // 本科阶段的年级
|
|
1: [ // 本科阶段的年级
|
|
@@ -541,7 +541,7 @@ export default {
|
|
|
async loadCoursesBySubject(subjectId) {
|
|
async loadCoursesBySubject(subjectId) {
|
|
|
try {
|
|
try {
|
|
|
// 调用实际的API获取课程数据
|
|
// 调用实际的API获取课程数据
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
this.axios.get(this.$httpApi.httpUrl('/student/courseInfo/list'), {
|
|
this.axios.get(this.$httpApi.httpUrl('/student/courseInfo/list'), {
|
|
|
params: {
|
|
params: {
|
|
|
subjectId: subjectId, // 添加科目ID作为筛选条件
|
|
subjectId: subjectId, // 添加科目ID作为筛选条件
|
|
@@ -549,7 +549,7 @@ export default {
|
|
|
pageSize: 100,
|
|
pageSize: 100,
|
|
|
status: 1
|
|
status: 1
|
|
|
}
|
|
}
|
|
|
- }).then(response=>{
|
|
|
|
|
|
|
+ }).then(response=>{
|
|
|
// 检查API响应是否成功
|
|
// 检查API响应是否成功
|
|
|
if (response.data.success && response.data.code === 1) {
|
|
if (response.data.success && response.data.code === 1) {
|
|
|
// 将返回的数据映射为表格需要的格式
|
|
// 将返回的数据映射为表格需要的格式
|
|
@@ -611,7 +611,7 @@ export default {
|
|
|
}).finally(()=>{
|
|
}).finally(()=>{
|
|
|
this.selectLoading = false
|
|
this.selectLoading = false
|
|
|
})
|
|
})
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error('添加课程失败:', error);
|
|
console.error('添加课程失败:', error);
|
|
|
this.$message.error('选课失败,请重试');
|
|
this.$message.error('选课失败,请重试');
|
|
@@ -651,26 +651,26 @@ export default {
|
|
|
this.currentCourse.checked = true
|
|
this.currentCourse.checked = true
|
|
|
|
|
|
|
|
getStepModel().then(resp=>{
|
|
getStepModel().then(resp=>{
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if(resp.status == 200) {
|
|
if(resp.status == 200) {
|
|
|
let res = resp.data
|
|
let res = resp.data
|
|
|
- if(res.code == 1) {
|
|
|
|
|
|
|
+ if(res.code == 1) {
|
|
|
let stepModels = res.data.dataList
|
|
let stepModels = res.data.dataList
|
|
|
for(let n =0 ;n<stepModels.length;n++) {
|
|
for(let n =0 ;n<stepModels.length;n++) {
|
|
|
- let m = stepModels[n]
|
|
|
|
|
|
|
+ let m = stepModels[n]
|
|
|
this.stepscore[m.name] = m.score
|
|
this.stepscore[m.name] = m.score
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}).finally(d=>{
|
|
}).finally(d=>{
|
|
|
this.getGoalInfoByCourse(this.currentCourse.id)
|
|
this.getGoalInfoByCourse(this.currentCourse.id)
|
|
|
- })
|
|
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
getCourseList() {
|
|
getCourseList() {
|
|
|
this.loading = true
|
|
this.loading = true
|
|
|
- this.axios.get(this.$httpApi.httpUrl('/student/courseInfo/mylist'), {
|
|
|
|
|
- }).then(response => {
|
|
|
|
|
|
|
+ this.axios.get(this.$httpApi.httpUrl('/student/courseInfo/mylist'), {
|
|
|
|
|
+ }).then(response => {
|
|
|
this.courseList = response.data.data
|
|
this.courseList = response.data.data
|
|
|
if (this.courseList && this.courseList.length > 0) {
|
|
if (this.courseList && this.courseList.length > 0) {
|
|
|
this.currentCourse = this.courseList[0]
|
|
this.currentCourse = this.courseList[0]
|