feat:增加项目及学习路径面授任务学员

src/assets/scss/common.scss

@@ -397,6 +397,7 @@ textarea {
     overflow-x: auto;
     display: flex;
     flex-direction: column;
+
   }
 }
 

src/components/drawers/FaceStu.vue

@@ -37,7 +37,7 @@
                 placeholder="请输入姓名"
               />
             </div>
-            <div class="namecon" style="margin-right: 30px">
+            <!-- <div class="namecon" style="margin-right: 30px">
               <div class="name">考勤：</div>
               <div class="select">
                 <a-select
@@ -50,7 +50,7 @@
                   showSearch
                 ></a-select>
               </div>
-            </div>
+            </div> -->
             <div class="namecon">
               <div class="name">签到状态：</div>
               <div class="select">
@@ -146,7 +146,7 @@
       </div>
     </div>
 
-    <div class="botm"></div>
+    <div class="botm" style="height: 100px"></div>
     <div class="btnn">
       <button class="btn1">取消</button>
       <button class="btn2">确定</button>
@@ -414,20 +414,42 @@ export default {
         },
         {
           title: "所在部门",
-          dataIndex: "com",
+          dataIndex: "studentDepartName",
           // width: "30%",
-          key: "com",
+          key: "studentDepartName",
           width: 50,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span>
+                  {text.record.studentDepartName
+                    ? text.record.studentDepartName
+                    : "-"}
+                </span>
+              </div>
+            );
+          },
         },
         {
           title: "所在岗位",
-          dataIndex: "gang",
+          dataIndex: "studentJobName",
-          key: "gang",
+          key: "studentJobName",
           width: 50,
           align: "center",
           className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <span>
+                  {text.record.studentJobName
+                    ? text.record.studentJobName
+                    : "-"}
+                </span>
+              </div>
+            );
+          },
         },
         {
           title: "签到时间",

src/components/drawers/project/ProjectFaceTaskManage.vue

@@ -3,7 +3,7 @@
     :visible="Fvisible"
     class="drawerStyle ProjectFaceTaskManage"
     placement="right"
-    width="60%"
+    width="80%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -629,8 +629,11 @@ export default {
 
 <style lang="scss">
 .ProjectFaceTaskManage {
+  .ant-drawer-content-wrapper {
+    max-width: 1300px;
+  }
   .drawerMain {
-    min-width: 550px;
+    min-width: 700px;
     margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;

src/components/drawers/router/RouterFaceTeachManage.vue

@@ -4,7 +4,7 @@
     :visible="FaceTeachModelVisible"
     class="drawerStyle ProjectFaceTaskManage"
     placement="right"
-    width="60%"
+    width="80%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -643,8 +643,11 @@ export default {
   
   <style lang="scss">
 .ProjectFaceTaskManage {
+  .ant-drawer-content-wrapper {
+    max-width: 1300px;
+  }
   .drawerMain {
-    min-width: 550px;
+    min-width: 700px;
     margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;

src/views/learningpath/LevelAdd.vue

@@ -908,11 +908,12 @@
         v-model:studentId="studentId"
       />
       <!-- 面授学员抽屉 -->
-      <face-stu v-model:FSvisible="FSvisible" :datasource="studentData" />
+      <RouterFaceStu v-model:FSvisible="FSvisible" :datasource="facestudent" />
       <!-- 活动考勤抽屉 -->
       <active-attendance
         v-model:AAvisible="AAvisible"
         :title="showKaoqinText"
+        classify="2"
       />
       <!-- 时间管理抽屉 -->
       <time-manage v-model:Tvisible="visible" :title="showTimeText" />
@@ -1161,7 +1162,7 @@ import { message, Modal } from "ant-design-vue";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import CheckStu from "../../components/drawers/CheckStu";
-import FaceStu from "../../components/drawers/FaceStu";
+import RouterFaceStu from "../../components/drawers/router/RouterFaceStu";
 import ActiveAttendance from "../../components/drawers/ActiveAttendance";
 import TimeManage from "../../components/drawers/TimeManage";
 import TestManage from "../../components/drawers/TestManage";
@@ -1195,7 +1196,7 @@ export default {
     ProjCheckShip,
     ImpStu,
     CheckStu,
-    FaceStu,
+    RouterFaceStu,
     ActiveAttendance,
     TimeManage,
     TestManage,
@@ -1396,7 +1397,7 @@ export default {
       examLevelName: "",
       evaluationLevelName: "",
 
-      studentData: "",
+      facestudent: "",
     });
 
     const levelList = reactive({
@@ -1606,8 +1607,8 @@ export default {
     //面授学员的弹窗
     const showFS = (item) => {
       state.FSvisible = true;
-      state.studentData = item;
+      state.facestudent = item;
-      console.log("studentData", state.studentData);
+      console.log("facestudent", state.facestudent);
     };
     //考勤的抽屉
     const showAA = (course) => {

src/views/projectcenter/TaskPage.vue

@@ -573,7 +573,7 @@
                         <div
                           class="operation"
                           style="cursor: pointer"
-                          @click="showFS"
+                          @click="showFS(item)"
                           v-if="item.type == 2"
                         >
                           学员
@@ -625,7 +625,12 @@
                               : item.type == '5'
                               ? showTest(item.name, item.projectTaskId, item)
                               : item.type == '10'
-                              ? showEval(item.name, item.projectTaskId, item.type, item)
+                              ? showEval(
+                                  item.name,
+                                  item.projectTaskId,
+                                  item.type,
+                                  item
+                                )
                               : item.type == '12'
                               ? showWork(item.name, item.projectTaskId)
                               : item.type == '13'
@@ -1164,9 +1169,16 @@
       v-model:projectId="projectId"
     />
     <!-- 面授学员抽屉 -->
-    <face-stu v-model:FSvisible="FSvisible" />
+    <ProjectFaceStu
+      v-model:FSvisible="FSvisible"
+      :projectTaskInfo="facestudent"
+    />
     <!-- 活动考勤抽屉 -->
-    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
+    <active-attendance
+      v-model:AAvisible="AAvisible"
+      :title="showkaoqinText"
+      classify="1"
+    />
 
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
@@ -1728,7 +1740,7 @@ import ProjectEvalManage from "../../components/drawers/project/ProjectEvalManag
 import SubsetManage from "../../components/drawers/SubsetManage";
 import MemberList from "../../components/drawers/MemberList";
 import ActiveAttendance from "../../components/drawers/ActiveAttendance";
-import FaceStu from "../../components/drawers/FaceStu";
+import ProjectFaceStu from "../../components/drawers/project/ProjectFaceStu";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import ImportStu from "../../components/drawers/ImportStu";
 import SeeStu from "../../components/drawers/SeeStu";
@@ -1776,7 +1788,7 @@ export default {
     ProjectEvalManage,
     SubsetManage,
     MemberList,
-    FaceStu,
+    ProjectFaceStu,
     ActiveAttendance,
     // StuAdd,
     ProjCheckShip,
@@ -2455,7 +2467,8 @@ export default {
       commonData: "",
       commonLevelName: "",
       evaltype: "",
-      evalData: ""
+      evalData: "",
+      facestudent: "",
     });
 
     const levelList = reactive({
@@ -2726,8 +2739,10 @@ export default {
       state.subsetVisivle = true;
     };
     //面授学员的弹窗
-    const showFS = () => {
+    const showFS = (item) => {
       state.FSvisible = true;
+      state.facestudent = item;
+      console.log("facestudent", state.facestudent);
     };
     //面授学员的弹窗
     const showMemberList = (id) => {