完成活动页面学员列表数据缺失

This commit is contained in:
lpq
2023-02-18 22:01:42 +08:00
parent d222853ec7
commit 2ec1f206ca
4 changed files with 31 additions and 19 deletions

View File

@@ -24,7 +24,7 @@
{{ datasource && datasource.endTime ? datasource.endTime : "-" }} {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
</div> </div>
<div class="endtime" style="margin-left: 64px">签到时间{{beginTime}}</div> <div class="endtime" style="margin-left: 64px">签到时间{{beginTime}}</div>
<!-- <div class="endtime" style="margin-left: 40px">签退时间{{endTime}}</div> --> <!-- <div class="endtime" style="margin-left: 40px">签退时间{{endTime}}</div> -->
</div> </div>
@@ -443,6 +443,7 @@ export default {
}; };
const getTableData = () => { const getTableData = () => {
debugger
console.log('当前是项目还是路径图 1 路径图 2 项目', props.types) console.log('当前是项目还是路径图 1 路径图 2 项目', props.types)
if ( props.datasource.type == 6 && props.types==1 || props.datasource.type == 9 && props.types==1) { if ( props.datasource.type == 6 && props.types==1 || props.datasource.type == 9 && props.types==1) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
@@ -452,8 +453,8 @@ export default {
currentStageId: props.datasource.chapterId, currentStageId: props.datasource.chapterId,
type: 2, type: 2,
pid: props.datasource.routerId, pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId, taskId: props.datasource.id,
taskType: props.datasource.type, taskType: props.datasource.type,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
signStatus: state.projectName2 signStatus: state.projectName2
@@ -465,7 +466,7 @@ export default {
currentStageId: props.datasource.chapterId, currentStageId: props.datasource.chapterId,
type: 2, // 1项目 2 路径 type: 2, // 1项目 2 路径
pid: props.datasource.routerId, pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId, taskId: props.datasource.id,
taskType: props.datasource.type, taskType: props.datasource.type,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
@@ -497,8 +498,8 @@ export default {
currentStageId: props.datasource.stageId, currentStageId: props.datasource.stageId,
type: 1, type: 1,
pid: props.datasource.projectId, pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId, taskId: props.datasource.projectTaskId,
taskType: props.datasource.type, taskType: props.datasource.type,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
signStatus: state.projectName2 signStatus: state.projectName2
@@ -510,7 +511,7 @@ export default {
currentStageId: props.datasource.stageId, currentStageId: props.datasource.stageId,
type: 1, // 1项目 2 路径 type: 1, // 1项目 2 路径
pid: props.datasource.projectId, pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId, taskId: props.datasource.projectTaskId,
taskType: props.datasource.type, taskType: props.datasource.type,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
@@ -735,12 +736,12 @@ export default {
customRender: (value) => { customRender: (value) => {
return ( return (
<div class="opa" style='display:flex;justify-content:center;align-items:center;'> <div class="opa" style='display:flex;justify-content:center;align-items:center;'>
<div <div
onClick={()=>{ onClick={()=>{
console.log("点击签到", value); console.log("点击签到", value);
{/* showsingleqdModal(); */} {/* showsingleqdModal(); */}
{/* AttendanceSign */} {/* AttendanceSign */}
let obj = { let obj = {
courseId: Number(props.datasource.courseId), courseId: Number(props.datasource.courseId),
routerId: Number(props.datasource.routerId), routerId: Number(props.datasource.routerId),
@@ -779,7 +780,7 @@ export default {
} }
<div>签到</div> <div>签到</div>
</div> </div>
<div <div
onClick={()=>{ onClick={()=>{
console.log("点击请假", value); console.log("点击请假", value);
{/* showsingleqjModal(); */} {/* showsingleqjModal(); */}
@@ -919,7 +920,7 @@ export default {
}&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}` }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`
); );
} }
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
// pageNo: state.currentPage, // pageNo: state.currentPage,

View File

@@ -247,9 +247,9 @@
<!-- 换组弹窗 --> <!-- 换组弹窗 -->
<ChangeGroupModal <ChangeGroupModal
v-model:changegroupV="changegroupV" v-model:changegroupV="checkgroupParam.changegroupV"
:groupList="groupList" :groupList="checkgroupParam.checkgroupList"
:checkgroupStuId="checkgroupStuId" :checkgroupStuId="checkgroupParam.checkgroupStuId"
/> />
<!-- 批量调整关卡弹窗 --> <!-- 批量调整关卡弹窗 -->
<!-- 取消学员弹窗 --> <!-- 取消学员弹窗 -->
@@ -350,6 +350,7 @@
<script setup> <script setup>
import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue"; import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1"; import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1";
import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
import CommonStudent from "@/components/student/CommonStudent"; import CommonStudent from "@/components/student/CommonStudent";
import ChangeLevelModal from "./ChangeLevelModal.vue"; import ChangeLevelModal from "./ChangeLevelModal.vue";
import { message, Modal } from "ant-design-vue"; import { message, Modal } from "ant-design-vue";
@@ -400,11 +401,6 @@ const topFlagList = ref([
}, },
]); ]);
const changegroupV = ref({
});
const checkgroupStuId = ref({});
const groupList = ref({});
const tablecolumns = ref([ const tablecolumns = ref([
{ {
title: "姓名", title: "姓名",
@@ -516,6 +512,13 @@ const tableParam = ref({
type: props.type, type: props.type,
pid: props.id, pid: props.id,
}); });
const checkgroupParam = ref({
changegroupV: false, //学员名称
checkgroupList: "", //学员小组
checkgroupStuId: null,
});
const stuSelectKeys = ref([]); const stuSelectKeys = ref([]);
const tableData = ref({ const tableData = ref({
list: [], list: [],
@@ -532,6 +535,11 @@ const stuRowSelection = computed(() => ({
//显示学员换组弹窗
function showChangeGroupModal () {
debugger
checkgroupParam.value.changegroupV = true;
}
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {

View File

@@ -1843,6 +1843,8 @@ export default {
}; };
//考勤的抽屉 //考勤的抽屉
const showAA = (course, a, data) => { const showAA = (course, a, data) => {
debugger
console.log("直播管理", data);
state.AAvisible = true; state.AAvisible = true;
state.liveData = data; state.liveData = data;
state.showKaoqinText = "直播"; state.showKaoqinText = "直播";

View File

@@ -3171,6 +3171,7 @@ export default {
} }
//考勤的抽屉 //考勤的抽屉
const showAA = (course, a, data) => { const showAA = (course, a, data) => {
debugger
state.AAvisible = true; state.AAvisible = true;
state.liveData = data; state.liveData = data;
state.showKaoqinText = "直播"; state.showKaoqinText = "直播";