feat:合并

This commit is contained in:
lixg
2023-01-06 11:56:44 +08:00
2 changed files with 61 additions and 28 deletions

View File

@@ -12,4 +12,7 @@ export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/get
export const ExportExam = (obj) => http.post('/admin/exam/manage/exportExam', obj) export const ExportExam = (obj) => http.post('/admin/exam/manage/exportExam', obj)
// 获取在线管理的信息 // 获取在线管理的信息
export const QueryOnlineManagementDetail = (obj) => http.post('/admin/online/manage/queryOnlineManagementDetail', obj) export const QueryOnlineManagementDetail = (obj) => http.post('/admin/online/manage/queryOnlineManagementDetail', obj)
// 获取 课程库-面授管理-管理-学习记录 信息
export const GetCourseStudent = (obj) => http.get('/admin/student/getCourseStudent', {params: obj})

View File

@@ -1104,7 +1104,7 @@
<a-table <a-table
:columns="columns2" :columns="columns2"
:data-source="tableData3" :data-source="tableData3"
:loading="tableDataTotal222 === -1 ? true : false" :loading="manageStuLoading"
:pagination="false" :pagination="false"
> >
<template #bodyCell="{ column }"> <template #bodyCell="{ column }">
@@ -1120,7 +1120,7 @@
showQuickJumper="true" showQuickJumper="true"
hideOnSinglePage="true" hideOnSinglePage="true"
:pageSize="pageSize222" :pageSize="pageSize222"
:current="currentPage222" :current="currentPage222"
:total="tableDataTotal222" :total="tableDataTotal222"
class="pagination" class="pagination"
@change="handelChangePage222" @change="handelChangePage222"
@@ -2302,6 +2302,7 @@ import {
} from "vue"; } from "vue";
import * as api from "../../api/indexInvist.js"; import * as api from "../../api/indexInvist.js";
import * as apis from "../../api/indexTaskManage";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { useRouter, useRoute } from "vue-router"; import { useRouter, useRoute } from "vue-router";
// import StuAdd from "../../components/drawers/StuAdd"; // import StuAdd from "../../components/drawers/StuAdd";
@@ -2547,22 +2548,22 @@ const columns1 = [
const columns2 = [ const columns2 = [
{ {
title: "姓名", title: "姓名",
dataIndex: "projectName", dataIndex: "studentName",
key: "projectName", key: "studentName",
width: "12%", width: "12%",
align: "center", align: "center",
}, },
{ {
title: "工号", title: "工号",
dataIndex: "numb", dataIndex: "studentUserNo",
key: "numb", key: "studentUserNo",
width: "12%", width: "12%",
align: "center", align: "center",
}, },
{ {
title: "开课名称", title: "开课名称",
dataIndex: "cname", dataIndex: "courseName",
key: "cname", key: "courseName",
width: "12%", width: "12%",
align: "center", align: "center",
}, },
@@ -2575,22 +2576,22 @@ const columns2 = [
}, },
{ {
title: "数据来源", title: "数据来源",
dataIndex: "source", dataIndex: "courseSource",
key: "source", key: "courseSource",
width: "12%", width: "12%",
align: "center", align: "center",
}, },
{ {
title: "学习时间", title: "学习时间",
dataIndex: "applytime", dataIndex: "beginTime",
key: "applytime", key: "beginTime",
width: "12%", width: "12%",
align: "center", align: "center",
}, },
{ {
title: "签到时间", title: "签到时间",
dataIndex: "signtime", dataIndex: "signTime",
key: "signtime", key: "signTime",
width: "12%", width: "12%",
align: "center", align: "center",
}, },
@@ -3250,6 +3251,8 @@ export default defineComponent({
gl_selectV2: undefined, gl_selectV2: undefined,
gl_inputV1: "", gl_inputV1: "",
gl_inputV2: "", gl_inputV2: "",
manageStuLoading: true,
currentFaceId:"",
//开课 //开课
kk_eidt: false, kk_eidt: false,
kkinputV1: "", kkinputV1: "",
@@ -4082,14 +4085,13 @@ export default defineComponent({
const handleSearchTable2 = () => { const handleSearchTable2 = () => {
console.log(7878); console.log(7878);
getTableDate33(); // getTableDate33();
}; };
const handleSearchTable3 = () => { const handleSearchTable3 = () => {
console.log(7878); state.manageStuLoading = true;
message.error("该课程暂学员学习记录"); getCourseStudentList();
getTableDate333();
}; };
const getTableDate33 = async () => { // const getTableDate33 = async () => {
// let datas = state.tableData2; // let datas = state.tableData2;
// let res = await listReview({ // let res = await listReview({
// pageNo: state.currentPage22, // pageNo: state.currentPage22,
@@ -4112,9 +4114,9 @@ export default defineComponent({
// true // true
// ); // );
// state.tableData2 = datas; // state.tableData2 = datas;
}; // };
// 渲染开课操作 // 渲染开课操作
const getTableDate333 = async () => { // const getTableDate333 = async () => {
// let datas = state.tableData2; // let datas = state.tableData2;
// let res = await studyRecordList({ // let res = await studyRecordList({
// pageNo: state.currentPage222, // pageNo: state.currentPage222,
@@ -4137,7 +4139,7 @@ export default defineComponent({
// true // true
// ); // );
// state.tableData2 = datas; // state.tableData2 = datas;
}; // };
// 渲染开课操作 // 渲染开课操作
const getTableDate3 = async () => { const getTableDate3 = async () => {
// let datas = state.tableData6; // let datas = state.tableData6;
@@ -5114,12 +5116,12 @@ export default defineComponent({
const handelChangePage222 = (page, pageSize) => { const handelChangePage222 = (page, pageSize) => {
state.currentPage222 = page; state.currentPage222 = page;
state.pageSize222 = pageSize; state.pageSize222 = pageSize;
getTableDate333(); getCourseStudentList();
}; };
const handelChangePage22 = (page, pageSize) => { const handelChangePage22 = (page, pageSize) => {
state.currentPage22 = page; state.currentPage22 = page;
state.pageSize22 = pageSize; state.pageSize22 = pageSize;
getTableDate33(); // getTableDate33();
}; };
const handelChangePage2 = (page, pageSize) => { const handelChangePage2 = (page, pageSize) => {
state.currentPage2 = page; state.currentPage2 = page;
@@ -5198,15 +5200,43 @@ export default defineComponent({
// 管理开课 // 管理开课
const handleGuan22 = (item) => { const handleGuan22 = (item) => {
state.manageStuLoading = true;
console.log(787666, item); console.log(787666, item);
state.faceClassification = item.contentTxt; state.faceClassification = item.contentTxt;
state.faceStatus = item.kkty; state.faceStatus = item.kkty;
state.currentFaceId = item.offcourseId;
getTableDate33(); getCourseStudentList();
getTableDate333();
state.newCourseName = item.name; state.newCourseName = item.name;
}; };
// 获取开课管理里的学员
function getCourseStudentList() {
console.log('开课管理学员搜索参数',{
pageNo: state.currentPage222,
pageSize: 10,
status: state.gl_selectV2?state.gl_selectV2:"",
studentName: state.gl_inputV2,
id:state.currentFaceId
})
apis.GetCourseStudent({
pageNo: state.currentPage222,
pageSize: 10,
status: state.gl_selectV2?state.gl_selectV2:"",
studentName: state.gl_inputV2,
id:state.currentFaceId
}).then(res=>{
console.log('获取开课管理学员信息', res)
// tableData3 tableDataTotal222 currentPage222 handelChangePage222
state.tableData3 = res.data.data.records;
state.tableDataTotal222 = res.data.data.total;
state.manageStuLoading = false;
}).catch(err=>{
console.log(err)
state.manageStuLoading = false;
})
}
const handlePostSure = (obj) => { const handlePostSure = (obj) => {
console.log("处理后参数,直接解构使用"); console.log("处理后参数,直接解构使用");
console.log(obj); console.log(obj);