From 2ec1f206cab2543eb989b046c739d4b3a7c7083c Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 18 Feb 2023 22:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B4=BB=E5=8A=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=A6=E5=91=98=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue | 23 ++++++++++----------
 src/components/student/TableStudent.vue     | 24 ++++++++++++++-------
 src/views/learningpath/LevelAdd.vue         |  2 ++
 src/views/projectcenter/TaskPage.vue        |  1 +
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 04ed82be..3e295b72 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -24,7 +24,7 @@
             ～
             {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
           </div>
-          
+
           <div class="endtime" style="margin-left: 64px">签到时间：{{beginTime}}</div>
           <!-- <div class="endtime" style="margin-left: 40px">签退时间：{{endTime}}</div> -->
         </div>
@@ -443,6 +443,7 @@ export default {
     };
 
     const getTableData = () => {
+      debugger
       console.log('当前是项目还是路径图 1 路径图 2 项目', props.types)
       if ( props.datasource.type == 6 && props.types==1 || props.datasource.type == 9 && props.types==1) {
         // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
@@ -452,8 +453,8 @@ export default {
           currentStageId: props.datasource.chapterId,
           type: 2,
           pid: props.datasource.routerId,
-          taskId: props.datasource.routerTaskId, 
-          taskType: props.datasource.type, 
+          taskId: props.datasource.id,
+          taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
           signStatus: state.projectName2
@@ -465,7 +466,7 @@ export default {
             currentStageId: props.datasource.chapterId,
             type: 2,   // 1项目 2 路径
             pid: props.datasource.routerId,
-            taskId: props.datasource.routerTaskId, 
+            taskId: props.datasource.id,
             taskType: props.datasource.type,
             status: state.projectName,
             studentName: state.name,
@@ -497,8 +498,8 @@ export default {
           currentStageId: props.datasource.stageId,
           type: 1,
           pid: props.datasource.projectId,
-          taskId: props.datasource.projectTaskId, 
-          taskType: props.datasource.type, 
+          taskId: props.datasource.projectTaskId,
+          taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
           signStatus: state.projectName2
@@ -510,7 +511,7 @@ export default {
             currentStageId: props.datasource.stageId,
             type: 1,   // 1项目 2 路径
             pid: props.datasource.projectId,
-            taskId: props.datasource.projectTaskId, 
+            taskId: props.datasource.projectTaskId,
             taskType: props.datasource.type,
             status: state.projectName,
             studentName: state.name,
@@ -735,12 +736,12 @@ export default {
           customRender: (value) => {
             return (
               <div class="opa" style='display:flex;justify-content:center;align-items:center;'>
-                <div 
+                <div
                   onClick={()=>{
                     console.log("点击签到", value);
                     {/* showsingleqdModal(); */}
                     {/* AttendanceSign */}
-                    
+
                     let obj = {
                       courseId: Number(props.datasource.courseId),
                       routerId: Number(props.datasource.routerId),
@@ -779,7 +780,7 @@ export default {
                   }
                   <div>签到</div>
                 </div>
-                <div 
+                <div
                   onClick={()=>{
                     console.log("点击请假", value);
                     {/* showsingleqjModal(); */}
@@ -919,7 +920,7 @@ export default {
           }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`
         );
       }
-      
+
       // api
       //   .exportTaskStudent({
       //     pageNo: state.currentPage,
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 1a15d453..6b59d36c 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -247,9 +247,9 @@
 
   <!-- 换组弹窗 -->
   <ChangeGroupModal
-          v-model:changegroupV="changegroupV"
-          :groupList="groupList"
-          :checkgroupStuId="checkgroupStuId"
+          v-model:changegroupV="checkgroupParam.changegroupV"
+          :groupList="checkgroupParam.checkgroupList"
+          :checkgroupStuId="checkgroupParam.checkgroupStuId"
   />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
@@ -350,6 +350,7 @@
 <script setup>
 import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1";
+import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.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([
   {
     title: "姓名",
@@ -516,6 +512,13 @@ const tableParam = ref({
   type: props.type,
   pid: props.id,
 });
+
+const checkgroupParam = ref({
+  changegroupV: false, //学员名称
+  checkgroupList: "", //学员小组
+  checkgroupStuId: null,
+});
+
 const stuSelectKeys = ref([]);
 const tableData = ref({
   list: [],
@@ -532,6 +535,11 @@ const stuRowSelection = computed(() => ({
 
 
 
+//显示学员换组弹窗
+function showChangeGroupModal  () {
+  debugger
+  checkgroupParam.value.changegroupV = true;
+}
 
 // 导出数据
 function exportTaskStu() {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 22129220..085d8646 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1843,6 +1843,8 @@ export default {
     };
     //考勤的抽屉
     const showAA = (course, a, data) => {
+      debugger
+      console.log("直播管理", data);
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index dc9cb2ee..5608fb99 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3171,6 +3171,7 @@ export default {
     }
     //考勤的抽屉
     const showAA = (course, a, data) => {
+      debugger
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";