diff --git a/src/api/growthpath.js b/src/api/growthpath.js index c98ba051..11200974 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -95,3 +95,9 @@ export const saveGrowth = (data) => http.post('/professional/compulsory/saveGrow // 催促学习 export const batchSendMessage = (data) => http.post('/professional/urgeLearning/batchSendMessage', data) + +// 删除手动添加的专业力必修 +export const delGrowth = (growthId) => http.get('/professional/compulsory/delGrowth/' + growthId) + +// 删除手动添加的专业力必修 +export const markComplete = (obj) => http.get('/professional/allocation/markComplete', { params: obj }) \ No newline at end of file diff --git a/src/components/growthpath/StudentManage.vue b/src/components/growthpath/StudentManage.vue index f7e53ae1..77cfae35 100644 --- a/src/components/growthpath/StudentManage.vue +++ b/src/components/growthpath/StudentManage.vue @@ -5,7 +5,7 @@ gutter="12" style="padding-left: 20px; margin-right: 0px" > - +
@@ -445,7 +445,7 @@ const tablecolumns = ref([ }[joinMethod]), }, { - title: "进度", + title: "必修进度", width: 100, align: "center", dataIndex: "progress", @@ -455,6 +455,17 @@ const tablecolumns = ref([
{record.progress || 0}%
), }, + { + title: "选修进度", + width: 100, + align: "center", + dataIndex: "electivepProgress", + key: "electivepProgress", + className: "h", + customRender: ({ record }) => ( +
{record.electivepProgress || 0}%
+ ), + }, { title: "完成状态", dataIndex: "completionStatus", @@ -512,7 +523,7 @@ function search() { function exportTaskStu() { window.open( buildUrl( - `${process.env.VUE_APP_BOE_API_URL}${process.env.VUE_APP_BASE_API_GROWTH}/professional/allocation/export`, + `${process.env.VUE_APP_BOE_API_URL}${process.env.VUE_APP_BASE_API_GROWTH || ''}/professional/allocation/export`, tableParam.value ) ); diff --git a/src/components/growthpath/StudentSeeStu.vue b/src/components/growthpath/StudentSeeStu.vue index 7fc1adb2..7357a7ac 100644 --- a/src/components/growthpath/StudentSeeStu.vue +++ b/src/components/growthpath/StudentSeeStu.vue @@ -146,7 +146,7 @@