diff --git a/src/api/indexTaskManage.js b/src/api/indexTaskManage.js index 590b51d3..a06f82f1 100644 --- a/src/api/indexTaskManage.js +++ b/src/api/indexTaskManage.js @@ -4,3 +4,9 @@ import http from "./config"; // 获取考试管理的信息 export const ExamManagementMessage = (obj) => http.post('/admin/exam/manage/queryExamManagementMessage',obj) + +// 获取评估管理的信息 +export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/getTaskStudent`, {params: obj}) + +// 导出学员信息 +export const ExportTaskStudent = (obj) => http.get('/admin/student/exportTaskStudent', {params: obj}) \ No newline at end of file diff --git a/src/components/common/FJUpload.vue b/src/components/common/FJUpload.vue index 19c34c28..d5d3c265 100644 --- a/src/components/common/FJUpload.vue +++ b/src/components/common/FJUpload.vue @@ -3,13 +3,13 @@
- + 附件:
支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-
+
+ diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 7a0a8e3c..e852c6c6 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -66,7 +66,7 @@
搜索
@@ -82,8 +82,8 @@
催促学习
-
-
+
+
导出数据
@@ -92,7 +92,7 @@ style="border: 1px solid #f2f6fe" :columns="tableDataFunc()" :data-source="tabledata" - :loading="tableDataTotal === -1 ? true : false" + :loading="tableDataTotalLoading" :scroll="{ x: 900 }" :pagination="false" /> @@ -106,7 +106,7 @@ :current="currentPage" :total="tableDataTotal" class="pagination" - @change="onChange" + @change="changePaginationStu" v-if="tableDataTotal > 10" />
@@ -114,8 +114,8 @@
- - + +
@@ -125,6 +125,7 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue"; import { message } from "ant-design-vue"; // import * as api from "../../../api/index"; +import * as api from '../../../api/indexTaskManage'; export default { name: "RouterCommonManage", @@ -137,6 +138,10 @@ export default { type: String, default: "", }, + levelName: { + type: String, + default: "", + }, projectTaskId: { type: Number, default: null, @@ -161,82 +166,80 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: null, + projectName: "", projectNameList: [ + // { + // id: 1, + // value: "-1", + // label: "未开始", + // }, { id: 1, - value: "-1", - label: "未开始", - }, - { - id: 2, value: "0", label: "未完成", }, { - id: 3, + id: 2, value: "1", label: "已完成", }, ], - tabledata: [ - { - workNum: "123", - userName: "li", - deptName: "开发", - jobName: "前端开发", - level:"关卡一", - time: "2022-07-22 14:00:30", - status: "已完成", - }, - ], + tabledata: [], + tableDataTotalLoading: true, // 表格loading加载配置 }); const tableDataFunc = () => { const columns = [ { title: "工号", - dataIndex: "workNum", - key: "workNum", + dataIndex: "studentUserNo", + key: "studentUserNo", width: 50, align: "center", className: "h head", }, { title: "姓名", - dataIndex: "userName", - key: "userName", + dataIndex: "studentName", + key: "studentName", width: 50, align: "center", className: "h head", }, { title: "所在部门", - dataIndex: "deptName", - key: "deptName", + dataIndex: "studentDepartName", + key: "studentDepartName", width: 60, align: "center", className: "h", }, { title: "所在岗位", - dataIndex: "jobName", - key: "jobName", + dataIndex: "studentJobName", + key: "studentJobName", width: 60, align: "center", className: "h", }, { title: "学员关卡", - dataIndex: "level", - key: "level", + dataIndex: "currentStageName", + key: "currentStageName", width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {props.levelName} +
+ ); + } }, { title: "完成时间", - dataIndex: "time", - key: "time", + dataIndex: "endStudyTime", + key: "endStudyTime", width: 100, align: "center", className: "h", @@ -248,6 +251,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.status==0?"未完成":"已完成"} +
+ ); + } }, ]; return columns; @@ -262,6 +272,8 @@ export default { }; const afterVisibleChange = (bol) => { if (bol == true) { + console.log('当前是什么类型',props.datasource.type) + state.tableDataTotalLoading = true; getData(); } }; @@ -277,18 +289,80 @@ export default { console.log("Page: ", pageNumber); }; + // 获取数据 function getData() { - state.tabledata = [ - { - workNum: "123", - userName: "li", - deptName: "开发", - jobName: "前端开发", - level:"关卡一", - time: "2022-07-22 14:00:30", - status: "已完成", - }, - ] + if(props.datasource.type==11){ + // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 + console.log('我是传递的查询参数',{ + pageNo:state.currentPage, + pageSize:state.pageSize, + currentStageId:props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId, + status: state.projectName, + studentName: state.name + }) + api.AssessmentManagementMessage({ + pageNo:state.currentPage, + pageSize:state.pageSize, + currentStageId:props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId, + status: state.projectName, + studentName: state.name + }).then(res=>{ + console.log(res) + if(res.status==200){ + state.tabledata = res.data.data.records; + state.tableDataTotal =res.data.data.total; + state.tableDataTotalLoading = false; + } + }).catch(err=>{ + console.log(err) + state.tableDataTotalLoading = false; + state.tabledata = []; + }) + }else{ + state.tableDataTotalLoading = false; + state.tabledata = []; + } + } + + // 搜索按钮 + function searchTaskList() { + state.currentPage = 1; + state.tableDataTotalLoading = true; + getData(); + } + // 重置按钮 + function resetTaskList() { + state.tableDataTotalLoading = true; + state.currentPage = 1; + state.name = ""; + state.projectName = ""; + getData(); + } + + //分页 + const changePaginationStu = (page) => { + state.tableDataTotalLoading = true; + state.currentPage = page; + getData(); + }; + + // 导出数据 + function exportTaskStu() { + api.ExportTaskStudent({ + pageNo:state.currentPage, + pageSize:state.pageSize, + currentStageId:props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId + }).then(res=>{ + console.log(res) + }).catch(err=>{ + console.log(err) + }) } return { @@ -301,6 +375,10 @@ export default { onMounted, onUnmounted, onChange, + searchTaskList, + resetTaskList, + changePaginationStu, + exportTaskStu }; }, }; diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index cb469bd3..eb655985 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -347,6 +347,7 @@ } // 搜索 function searchTableData() { + state.currentPage = 1; state.loadingData = true; getData(); } diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index cce412f5..94c83c0e 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1490,6 +1490,8 @@ /> + +
@@ -1507,6 +1509,9 @@ >
+ + +
报名设置 @@ -6029,109 +6034,113 @@ export default defineComponent({ } } - .mbl_items12 { - width: 440px; - margin-left: 100px; - .i12_box1 { - display: flex; - align-items: center; - padding: 17px 0px 17px 21px; - border: 1px solid #eff4fc; - border-radius: 8px; - margin-bottom: 10px; - - .file_img { - width: 27px; - height: 32px; - background-image: url(@/assets/images/coursewareManage/imgs.png); - margin-right: 22px; - - img { - width: 100%; - height: 100%; - } - } - - .file_detail { - width: 250px; - margin-right: 21px; - - .file_updata { - display: flex; - align-items: center; - - .updatabox { - position: relative; - width: 230px; - height: 5px; - background-color: rgba(192, 192, 192, 0.25); - border-radius: 3px; - - .updatacolor { - position: absolute; - left: 0; - width: 100%; - height: 5px; - background-color: #57c887; - border-radius: 3px; - } - - .updatacolor2 { - position: absolute; - left: 0; - width: 80%; - height: 5px; - background-color: #ff7474; - border-radius: 3px; - } - - .updatacolor3 { - position: absolute; - left: 0; - width: 60%; - height: 5px; - background-color: #4ea6ff; - border-radius: 3px; - } - - .updataxq { - position: absolute; - right: 2px; - top: -30px; - color: #57c887; - } - - .updataxq2 { - position: absolute; - right: 2px; - top: -30px; - color: #ff7474; - } - - .updataxq3 { - position: absolute; - right: 2px; - top: -30px; - color: #4ea6ff; - } - } - } - } - - .file_operation { - display: flex; - - .fobox { - margin-right: 5px; - cursor: pointer; - } - } - } - } .items_fj { margin-bottom: 1px; + .fujian{ + display: none; + } + .mbl_items12 { + width: 440px; + margin-right:56px; + + .i12_box1 { + display: flex; + align-items: center; + padding: 17px 0px 17px 21px; + border: 1px solid #eff4fc; + border-radius: 8px; + margin-bottom: 10px; + + .file_img { + width: 27px; + height: 32px; + background-image: url(@/assets/images/coursewareManage/imgs.png); + margin-right: 22px; + + img { + width: 100%; + height: 100%; + } + } + + .file_detail { + width: 250px; + margin-right: 21px; + + .file_updata { + display: flex; + align-items: center; + + .updatabox { + position: relative; + width: 230px; + height: 5px; + background-color: rgba(192, 192, 192, 0.25); + border-radius: 3px; + + .updatacolor { + position: absolute; + left: 0; + width: 100%; + height: 5px; + background-color: #57c887; + border-radius: 3px; + } + + .updatacolor2 { + position: absolute; + left: 0; + width: 80%; + height: 5px; + background-color: #ff7474; + border-radius: 3px; + } + + .updatacolor3 { + position: absolute; + left: 0; + width: 60%; + height: 5px; + background-color: #4ea6ff; + border-radius: 3px; + } + + .updataxq { + position: absolute; + right: 2px; + top: -30px; + color: #57c887; + } + + .updataxq2 { + position: absolute; + right: 2px; + top: -30px; + color: #ff7474; + } + + .updataxq3 { + position: absolute; + right: 2px; + top: -30px; + color: #4ea6ff; + } + } + } + } + + .file_operation { + display: flex; + + .fobox { + margin-right: 5px; + cursor: pointer; + } + } + } + } } .items_btn { @@ -6981,106 +6990,7 @@ export default defineComponent({ } } - .mbl_items12 { - width: 440px; - margin-left: 100px; - - .i12_box1 { - display: flex; - align-items: center; - padding: 17px 0px 17px 21px; - border: 1px solid #eff4fc; - border-radius: 8px; - margin-bottom: 10px; - - .file_img { - width: 27px; - height: 32px; - background-image: url(@/assets/images/coursewareManage/imgs.png); - margin-right: 22px; - - img { - width: 100%; - height: 100%; - } - } - - .file_detail { - width: 250px; - margin-right: 21px; - - .file_updata { - display: flex; - align-items: center; - - .updatabox { - position: relative; - width: 230px; - height: 5px; - background-color: rgba(192, 192, 192, 0.25); - border-radius: 3px; - - .updatacolor { - position: absolute; - left: 0; - width: 100%; - height: 5px; - background-color: #57c887; - border-radius: 3px; - } - - .updatacolor2 { - position: absolute; - left: 0; - width: 80%; - height: 5px; - background-color: #ff7474; - border-radius: 3px; - } - - .updatacolor3 { - position: absolute; - left: 0; - width: 60%; - height: 5px; - background-color: #4ea6ff; - border-radius: 3px; - } - - .updataxq { - position: absolute; - right: 2px; - top: -30px; - color: #57c887; - } - - .updataxq2 { - position: absolute; - right: 2px; - top: -30px; - color: #ff7474; - } - - .updataxq3 { - position: absolute; - right: 2px; - top: -30px; - color: #4ea6ff; - } - } - } - } - - .file_operation { - display: flex; - - .fobox { - margin-right: 5px; - cursor: pointer; - } - } - } - } + } } diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index cd18ec5c..008e3a49 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -75,7 +75,7 @@
-
+
@@ -235,13 +235,17 @@
+ +
+ + + 授课教师
@@ -250,8 +254,10 @@
+--> +
-
+
asterisk
@@ -270,7 +276,7 @@
-
+
附件
@@ -278,6 +284,8 @@
+ +