From f58d76056022ca16c70f37074d26276ea2bd1e3c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 14:11:40 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=90=8E=E4=BB=A5=E5=89=8D=E6=B7=BB=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 894b2f23..fede1abb 100644
--- a/src/components/student/CommonStudent.vue
+++ b/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);
   });
 }

From 96f3be181245b8622e77dad57029fcff1d8b1cc9 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 13 Jan 2023 14:28:08 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8B=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectEvalManage.vue   | 6 +++---
 src/components/drawers/project/ProjectOnlineManage.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue
index 9f40ef10..d625e0c4 100644
--- a/src/components/drawers/project/ProjectEvalManage.vue
+++ b/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",
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 77064fb0..416557ff 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/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",

From 8ca735a03de7fdf6533e1e389079bc952e25f485 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 14:53:09 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectFaceStu.vue | 2 +-
 src/components/drawers/router/RouterFaceStu.vue   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 2390a49b..15e9bc37 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/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 ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 0723232f..6d6e8c8a 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/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 ? "正常" : 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,

From d6bc7af3fcda5621da7578c7cc3ccbc45fd4d137 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 14:53:13 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectFaceStu.vue | 2 +-
 src/components/drawers/router/RouterFaceStu.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 15e9bc37..1d0a3405 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -632,7 +632,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
+                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 6d6e8c8a..0708be9c 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -575,7 +575,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.signStatus == null ? "-" : "异常"}</span>
+                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</span>
               </div>
             );
           },

From 06959aa12f5009db13491cba57e5f325e125f182 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 15:13:12 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=AD=A6=E5=91=98=E7=AD=BE=E5=88=B0=E6=9C=AA=E5=9C=A8?=
 =?UTF-8?q?=E8=A7=84=E5=AE=9A=E6=97=B6=E9=97=B4=E5=86=85=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectFaceStu.vue | 2 +-
 src/components/drawers/router/RouterFaceStu.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 1d0a3405..c09d3bba 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -632,7 +632,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</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>
             );
           },
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 0708be9c..565896ad 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -575,7 +575,7 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <span>{text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}</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>
             );
           },

From 156e84d273e24dd81b08d4d9f7efdc9c37fe6a7c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 16:10:48 +0800
Subject: [PATCH 6/8] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE-=E5=AD=A6=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=AF=BC=E5=87=BA=E5=AD=A6=E4=B9=A0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 03924a16..f08393ae 100644
--- a/src/components/student/TableStudent.vue
+++ b/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();

From 7bc5dd8fac90fde76a592ad42b05115916663333 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 16:46:52 +0800
Subject: [PATCH 7/8] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C-=E6=9F=A5=E7=9C=8B=E8=B0=83=E6=95=B4-?=
 =?UTF-8?q?=EF=BC=88=E7=9B=AE=E5=89=8D=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 48 +++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index e3e9459d..f79ce983 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/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,
     };
   },
 };

From 56f9a60b4d755a48716c7725e56d7d8728c84967 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 13 Jan 2023 17:48:26 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9C=AA=E4=BD=BF=E7=94=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue  | 1 +
 src/views/projectcenter/templateAdd.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index b4160ad0..9d5fbd5f 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/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
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 2895c488..2bc98f00 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/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