Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/project/ProjectEvalManage.vue

@@ -246,8 +246,8 @@ export default {
               );
             },
           },
-          {
-            title: "学员关卡",
+         /**  {
+            title: "学员阶段",
             dataIndex: "currentStageName",
             key: "currentStageName",
             width: 60,
@@ -261,7 +261,7 @@ export default {
                 </div>
               );
             },
-          },
+          },*/
           {
             title: "提交时间",
             dataIndex: "endStudyTime",

src/components/drawers/project/ProjectFaceStu.vue

@@ -632,7 +632,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : "异常"}</span>
+                <span>{ text.record.signStatus == null && new Date().getTime() > new Date(state.endTime).getTime() ? "异常" : text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常" }</span>
               </div>
             );
           },

src/components/drawers/project/ProjectOnlineManage.vue

@@ -261,7 +261,7 @@ export default {
             );
           },
         },
-        {
+       /** {
           title: "学员关卡",
           dataIndex: "currentStageName",
           key: "currentStageName",
@@ -276,7 +276,7 @@ export default {
               </div>
             );
           },
-        },
+         },*/
         {
           title: "完成时间",
           dataIndex: "lastStudyTime",

src/components/drawers/router/RouterFaceStu.vue

@@ -575,7 +575,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : "异常"}</span>
+                <span>{text.record.signStatus == null && new Date().getTime() > new Date(state.endTime).getTime() ? "异常" : text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },
@@ -756,6 +756,7 @@ export default {
         pid: props.datasource.routerId,
         // status: Number(state.name),
         studentName: state.name,
+        signStatus: state.projectName2,
         taskId: props.datasource.routerTaskId,
         taskType: props.datasource.type,
       });
@@ -767,6 +768,7 @@ export default {
           type: 2,
           pid: props.datasource.routerId,
           // status: Number(state.name),
+          signStatus: state.projectName2,
           studentName: state.name,
           taskId: props.datasource.routerTaskId,
           taskType: props.datasource.type,

src/components/student/CommonStudent.vue

@@ -594,6 +594,7 @@ const auditRowSelection = computed(() => ({
   preserveSelectedRowKeys: true,
 }));
 const closeDrawer = () => {
+  deleteDepSelect();
   visiable.value = false;
   stuData.value = [];
   nameSearch.value.keyword = "";
@@ -687,7 +688,7 @@ function peopleName(name) {
 }
 
 const resetStu = () => {
-  deleteDepSelect();
+  // deleteDepSelect();
   nameSearch.value.keyword = "";
   nameSearch.value.page = 1;
   nameSearch.value.pageSize = 10;
@@ -742,6 +743,7 @@ function handleStageOk() {
     groupIds: selectsData.value.groupList?.map((e) => e.id),
     studentList: selectsData.value.studentList,
   }).then(() => {
+    deleteDepSelect();
     emit("finash", true);
   });
 }

src/components/student/TableStudent.vue

@@ -117,6 +117,11 @@
           导出学习信息
         </a-button>
       </a-col>
+      <a-col :span="1.5" v-else>
+        <a-button class="cus-btn white" @click="exportTaskStuRouter">
+          导出学习信息
+        </a-button>
+      </a-col>
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
           <template #icon
@@ -496,13 +501,22 @@ const stuRowSelection = computed(() => ({
 }));
 // 导出数据
 function exportTaskStu() {
-  console.log("props.datasource", props.datasource);
+  console.log("props.datasource", props);
   window.open(
     `${
       process.env.VUE_APP_BASE_API
     }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
   );
 }
+ 
+function exportTaskStuRouter() {
+  console.log("props.datasource", props);
+  window.open(
+    `${
+      process.env.VUE_APP_BASE_API
+    }/admin/student/exportTaskStudent?type=${2}&pid=${props.id}&taskType=0`
+  );
+}
 
 onMounted(() => {
   getStuList();

src/views/learningpath/LevelAdd.vue

@@ -529,7 +529,36 @@
             :id="routerId"
             :stage="stage"
             :columns="tableDataFunc()"
-          ></TableStudent>
+          >
+          <!-- <template #extension="{ data: { record } }">
+            <div style="display: flex">
+              <div
+                @click="showStudent(record)"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 20px;
+                  cursor: pointer;
+                "
+              >
+                查看
+              </div>
+              <div 
+                @click="setLevels(record)"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 20px;
+                  cursor: pointer;
+                "
+              >
+                调整
+              </div>
+            </div>
+          </template> -->
+        </TableStudent>
         </a-tab-pane>
         <!-- 1211注释 待开放 -->
         <a-tab-pane key="4" tab="设置">
@@ -857,7 +886,7 @@
       <see-stu
         v-model:Seevisible="Seevisible"
         v-model:checkStuId="checkStuId"
-        v-model:projectId="projectId"
+        v-model:projectId="routerId"
       />
 
       <!-- 批量删除学员弹窗 -->
@@ -2451,6 +2480,19 @@ export default {
       // }
     }
 
+    // 点击学员管理-查看学员操作
+    function showStudent(record) {
+      console.log(record)
+      state.Seevisible = true;
+      state.checkStuId = record.studentId;
+    }
+
+    // 调整关卡
+    function setLevels(record) {
+      console.log(record)
+      state.visiblene = true;
+    } 
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2517,6 +2559,8 @@ export default {
       homeworkModel,
       commonModel,
       downloadFile,
+      showStudent,
+      setLevels,
     };
   },
 };

src/views/projectcenter/ProjectAdd.vue

@@ -507,6 +507,7 @@ export default {
     };
 
     function managerChange(e, l, d, t, orgName) {
+      console.log(e, l)
       state.projectInfo.sourceBelongId = d
       state.projectInfo.sourceBelongName = t
       state.projectInfo.sourceBelongFullName = orgName

src/views/projectcenter/templateAdd.vue

@@ -298,6 +298,7 @@ const createProject = () => {
 };
 
 function managerChange(e, l, d, t,orgName) {
+  console.log(e, l)
   projectInfo.value.valuesourceBelongId = d;
   projectInfo.value.sourceBelongName = t;
   projectInfo.value.sourceBelongFullName = orgName