From 0dbed0a9c7d8abb246b19a795a5a8a87d9b26702 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 14 Feb 2023 20:56:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=86=85=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 21 +++++++++++++++++----
 src/views/learningpath/LevelAdd.vue      | 11 +++++++----
 src/views/projectcenter/TaskPage.vue     |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index f5f4372f..015cda24 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -244,14 +244,14 @@
                   <div v-if="i < 11">
                     <div class="chose">
                       {{ item.realName }}
-                      <div class="ch" @click="stuDel(i)"></div>
+                      <div class="ch" @click="memberDel(i)"></div>
                     </div>
                   </div>
                   <div v-else>
                     <div v-if="person">
                       <div class="chose">
                         {{ item.realName }}
-                        <div class="ch" @click="stuDel(i)"></div>
+                        <div class="ch" @click="memberDel(i)"></div>
                       </div>
                     </div>
                   </div>
@@ -536,13 +536,23 @@ const getStu = () => {
   });
 };
 getStu();
-const projectChangePagination = () => {};
+const projectChangePagination = (page) => {
+  procurrentPage.value = page;
+  getStu();
+};
 function onProjectSelectChange(e, l) {
   console.log("eeeee", e, l);
   projectSelectKeys.value = e;
   selectsData.value.projectMemberList = l;
 }
 
+function memberDel(i) {
+  projectSelectKeys.value = projectSelectKeys.value.filter(
+    (e) => e !== selectsData.value.projectMemberList[i].id
+  );
+  selectsData.value.projectMemberList.splice(i, 1);
+}
+
 const person = ref(false);
 // const dept =ref(false)
 const group = ref(false);
@@ -889,7 +899,9 @@ function handleStageOk() {
     deptIds: selectsData.value.deptList?.map((e) => e.id),
     stageId: selectsData.value.stageId,
     groupIds: selectsData.value.groupList?.map((e) => e.id),
-    studentList: selectsData.value.studentList,
+    studentList: selectsData.value.studentList.concat(
+      selectsData.value.projectMemberList
+    ),
     groupName: props.groupName,
     groupId: props.groupId,
   }).then(() => {
@@ -940,6 +952,7 @@ watch(visiable, () => {
     studentList: [],
     deptList: [],
     groupList: [],
+    projectMemberList: [],
   };
   stuReset();
   auditReset();
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 4fbb04e0..9ce80e98 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -327,7 +327,7 @@
               <div class="taskmain">任务大纲</div>
 
               <router-link
-                :to="{ path: '/leveladddetail', query:{ routerId: routerId } }"
+                :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
                 class="editright"
                 v-if="checkPer(permissions)"
               >
@@ -340,7 +340,9 @@
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
-              <router-link :to="{ path: '/leveladddetail', query:{ routerId: routerId } }">
+              <router-link
+                :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
+              >
                 <div
                   class="taskbox"
                   style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -1364,7 +1366,7 @@ import TestManage from "../../components/drawers/TestManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
 import SeeStu from "../../components/drawers/SeeStu";
-import { useRouter,useRoute } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import { getRouterOverview } from "@/api/indexLearningPath";
 import { handleLearnPath } from "../../api/index1";
 import { GetRouterDetail } from "@/api/indexTask";
@@ -2552,7 +2554,7 @@ export default {
       // console.log("state.taskSyllabus", state.taskSyllabus);
       router.push({
         path: "/leveladddetail",
-        query:{ routerId: state.routerId } 
+        query: { routerId: state.routerId },
       });
       //       if (state.taskSyllabus.length===1) {
       //         if(state.taskSyllabus[0].taskList.length===0){
@@ -2597,6 +2599,7 @@ export default {
           "&id=" +
           item.projectTaskId;
       }
+      if (item.type == 3) return message.error("请在pc端完成");
 
       if (item.type == 4) {
         let date1 = new Date(item.endTime).getTime();
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d68096f6..761c2810 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -4719,7 +4719,7 @@ export default {
           "&id=" +
           item.projectTaskId;
       }
-
+      if (item.type == 3) return message.error("请在pc端完成");
       if (item.type == 4) {
         let date1 = new Date(item.endTime).getTime();
         let date2 = new Date().getTime();