diff --git a/src/views/student/group/data.tsx b/src/views/student/group/data.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..bc093e985ae37676b3ca02ab1280297b899539ed
--- /dev/null
+++ b/src/views/student/group/data.tsx
@@ -0,0 +1,5 @@
+import { BasicColumn } from "/@/components/Table";
+
+export const enteredGroupTableColumns: BasicColumn[] = [];
+
+export const teacherListTableColumns: BasicColumn[] = [];
diff --git a/src/views/student/group/detail/index.vue b/src/views/student/group/detail/index.vue
index 38ab55d57e4afef5b39681eb927af15d79a184b5..0ed24e667a584c49934be6fc816efacfde5d3c5e 100644
--- a/src/views/student/group/detail/index.vue
+++ b/src/views/student/group/detail/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="p-4">
     <BasicTable @register="registerTable">
+      <template #toolbar
+        >>
+        <a-button type="primary" @click="handleReturn"> 返回</a-button>
+      </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
@@ -9,52 +13,60 @@
               {
                 label: '详细信息',
                 icon: 'clarity:info-standard-line',
-                // onClick: handleDesc.bind(null, record),
+                onClick: handleDesc.bind(null, record),
               },
               {
-                label: '加入小组',
+                label: '申请加入',
                 icon: 'carbon:add-alt',
-                onClick: handleDelete.bind(null, record),
+                onClick: handleJoin.bind(null, record),
               },
             ]"
           />
         </template>
       </template>
     </BasicTable>
+    <GroupDescModal @register="registerDescModal" />
   </div>
 </template>
 <script lang="ts" setup>
   import { useMessage } from "/@/hooks/web/useMessage";
   import { defaultTableSettings } from "/@/hooks/core/useDefault";
   import { BasicTable, TableAction, useTable } from "/@/components/Table";
-  import { getPracticalGroupPage, removePracticalGroupById } from "/@/api/teacher/practice";
+  import { tableColumns } from "/@/views/teacher/group/list/group.data";
+  import { useModal } from "/@/components/Modal";
+  import GroupDescModal from "/@/views/teacher/group/list/GroupDesc.vue";
+  import { useRoute, useRouter } from "vue-router";
+  import { useTabs } from "/@/hooks/web/useTabs";
 
+  const router = useRouter();
+  const route = useRoute();
+  const { userId } = route.query;
   const [registerTable] = useTable({
     title: "教师小组详情",
     rowKey: "groupId",
-    columns: [],
-    api: getPracticalGroupPage,
+    columns: tableColumns,
+    beforeFetch(params) {
+      return { ...params, userId };
+    },
+    api: getGroupPageByUserId,
     ...defaultTableSettings,
   });
 
-  /* const [registerDescModal, { openModal: openDescModal }] = useModal();
-  const [registerEditModal, { openModal: openEditModal }] = useModal();
+  const [registerDescModal, { openModal: openDescModal }] = useModal();
 
   function handleDesc(data) {
     openDescModal(true, data);
   }
 
-  function handleEdit(data) {
-    openEditModal(true, { data, operType: TableOperEnum.UPDATE });
+  const { createMessage } = useMessage();
+  async function handleJoin(record) {
+    await joinGroup(record.groupId);
+    createMessage.success("成功发送申请，请耐心等待老师审核通过");
   }
 
-  function handleSave() {
-    openEditModal(true, { operType: TableOperEnum.SAVE });
-  } */
-
-  const { createMessage } = useMessage();
-  async function handleDelete(data) {
-    await removePracticalGroupById(data.groupId);
-    createMessage.info("删除小组成功");
+  const { closeCurrent } = useTabs();
+  function handleReturn() {
+    closeCurrent();
+    router.back();
   }
 </script>
diff --git a/src/views/student/group/join/index.vue b/src/views/student/group/join/index.vue
index 0b754f6f8aae5ec9d6204ec09804e269afa3421e..c1409e8388921f479ee123a11ae957a6c94ea186 100644
--- a/src/views/student/group/join/index.vue
+++ b/src/views/student/group/join/index.vue
@@ -21,22 +21,22 @@
 <script lang="ts" setup>
   import { defaultTableSettings } from "/@/hooks/core/useDefault";
   import { BasicTable, TableAction, useTable } from "/@/components/Table";
-  import { getPracticalGroupPage } from "/@/api/teacher/practice";
   import { useRouter } from "vue-router";
+  import { teacherListTableColumns } from "/@/views/student/group/data";
 
   const [registerTable] = useTable({
     title: "教师列表",
-    rowKey: "groupId",
-    columns: [],
-    api: getPracticalGroupPage,
+    rowKey: "userId",
+    columns: teacherListTableColumns,
+    api: getTeacherPage,
     ...defaultTableSettings,
   });
 
   const router = useRouter();
-  function handleDesc() {
-    // openDescModal(true, data);
+  function handleDesc(record) {
     router.push({
       name: "Detail",
+      query: { userId: record.userId },
     });
   }
 </script>
diff --git a/src/views/student/group/list/index.vue b/src/views/student/group/list/index.vue
index fbd6a29d94e796db508030aec6173791828f8669..d0a9428009ef5c883daf245f758c4778a8fbfcac 100644
--- a/src/views/student/group/list/index.vue
+++ b/src/views/student/group/list/index.vue
@@ -6,13 +6,13 @@
 <script lang="ts" setup>
   import { defaultTableSettings } from "/@/hooks/core/useDefault";
   import { BasicTable, useTable } from "/@/components/Table";
-  import { getPracticalGroupPage } from "/@/api/teacher/practice";
+  import { enteredGroupTableColumns } from "/@/views/student/group/data";
 
   const [registerTable] = useTable({
-    title: "小组列表",
+    title: "已加入小组",
     rowKey: "groupId",
-    columns: [],
-    api: getPracticalGroupPage,
+    columns: enteredGroupTableColumns,
+    api: getEnteredGroupPage,
     ...defaultTableSettings,
   });
 </script>
diff --git a/src/views/teacher/group/apply/ApplicationDesc.vue b/src/views/teacher/group/apply/ApplicationDesc.vue
new file mode 100644
index 0000000000000000000000000000000000000000..55517be497d01c90e2209e937a22548ba11f6550
--- /dev/null
+++ b/src/views/teacher/group/apply/ApplicationDesc.vue
@@ -0,0 +1,33 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    width="520px"
+    title="申请详情"
+    @ok="closeModal"
+    @register="registerModal"
+  >
+    <Description @register="registerDesc" :column="1" size="middle" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import Description from "/@/components/Description/src/Description.vue";
+  import { useDescription } from "/@/components/Description";
+  import BasicModal from "/@/components/Modal/src/BasicModal.vue";
+  import { useModalInner } from "/@/components/Modal";
+  import { ref } from "vue";
+  import { applicationSchema } from "/@/views/teacher/group/list/group.data";
+
+  const userData = ref({});
+
+  const [registerModal, { closeModal }] = useModalInner((data) => {
+    userData.value = data;
+  });
+
+  const [registerDesc] = useDescription({
+    data: userData,
+    schema: applicationSchema,
+  });
+</script>
+
+<style scoped></style>
diff --git a/src/views/teacher/group/apply/index.vue b/src/views/teacher/group/apply/index.vue
index 89afdd22a383dbfcadf4d92147c2d977d03a5a53..f8fa6b4f3e8b70ed49c385025006a9f5f166d4b2 100644
--- a/src/views/teacher/group/apply/index.vue
+++ b/src/views/teacher/group/apply/index.vue
@@ -9,13 +9,13 @@
               {
                 label: '详情',
                 icon: 'clarity:info-standard-line',
-                // onClick: handleDesc.bind(null, record),
+                onClick: handleDesc.bind(null, record),
               },
               {
                 label: '同意',
                 color: 'success',
                 icon: 'clarity:success-standard-line',
-                // onClick: handleEdit.bind(null, record),
+                onClick: handleAccept.bind(null, record),
               },
               {
                 label: '拒绝',
@@ -25,7 +25,7 @@
                   title: '确认拒绝？',
                   okText: '确认',
                   cancelText: '取消',
-                  confirm: handleDelete.bind(null, record),
+                  confirm: handleReject.bind(null, record),
                 },
               },
             ]"
@@ -33,37 +33,49 @@
         </template>
       </template>
     </BasicTable>
+    <ApplicationDescModal @register="registerDescModal" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { tableColums } from "../list/group.data";
   import { useMessage } from "/@/hooks/web/useMessage";
   import { defaultTableSettings } from "/@/hooks/core/useDefault";
   import { BasicTable, TableAction, useTable } from "/@/components/Table";
-  import { getPracticalGroupPage, removePracticalGroupById } from "/@/api/teacher/practice";
+  import { useModal } from "/@/components/Modal";
+  import ApplicationDescModal from "./ApplicationDesc.vue";
+  import { applicationTableColumns } from "/@/views/teacher/group/list/group.data";
 
-  const [registerTable] = useTable({
-    title: "小组列表",
-    rowKey: "groupId",
-    columns: tableColums,
-    api: getPracticalGroupPage,
+  const [registerTable, { setLoading }] = useTable({
+    title: "申请列表",
+    rowKey: "userId",
+    columns: applicationTableColumns,
+    api: getApplicationPage,
     ...defaultTableSettings,
   });
 
-  /* const [registerDescModal, { openModal: openDescModal }] = useModal();
-  const [registerEditModal, { openModal: openEditModal }] = useModal();
+  const [registerDescModal, { openModal: openDescModal }] = useModal();
 
+  const { createMessage } = useMessage();
   function handleDesc(data) {
     openDescModal(true, data);
   }
 
-  function handleEdit(data) {
-    openEditModal(true, { data, operType: TableOperEnum.UPDATE });
-  } */
+  async function handleAccept(record) {
+    try {
+      setLoading(true);
+      await acceptApplication(record.userId, record.groupId);
+      createMessage.success("已接受申请");
+    } finally {
+      setLoading(false);
+    }
+  }
 
-  const { createMessage } = useMessage();
-  async function handleDelete(data) {
-    await removePracticalGroupById(data.groupId);
-    createMessage.info("删除小组成功");
+  async function handleReject(record) {
+    try {
+      setLoading(true);
+      await rejectApplication(record.userId, record.groupId);
+      createMessage.success("已拒绝申请");
+    } finally {
+      setLoading(false);
+    }
   }
 </script>
diff --git a/src/views/teacher/group/list/group.data.tsx b/src/views/teacher/group/list/group.data.tsx
index a154ba53a0676856239f8b2ecd3e5dfe7607a96e..3dfa79886a58c78280cec2db92864da1add7e084 100644
--- a/src/views/teacher/group/list/group.data.tsx
+++ b/src/views/teacher/group/list/group.data.tsx
@@ -51,7 +51,7 @@ export const formSchema: FormSchema[] = [
   },
 ];
 
-export const tableColums: BasicColumn[] = [
+export const tableColumns: BasicColumn[] = [
   {
     title: "小组主键",
     dataIndex: "groupId",
@@ -74,3 +74,41 @@ export const tableColums: BasicColumn[] = [
     width: 100,
   },
 ];
+
+export const applicationSchema: DescItem[] = [
+  {
+    field: "userName",
+    label: "申请人",
+  },
+  {
+    field: "userCode",
+    label: "学号",
+  },
+  {
+    field: "reason",
+    label: "申请理由",
+  },
+  {
+    field: "applyDate",
+    label: "申请时间",
+  },
+];
+
+export const applicationTableColumns: BasicColumn[] = [
+  {
+    title: "申请日期",
+    dataIndex: "applyDate",
+  },
+  {
+    title: "申请人",
+    dataIndex: "userName",
+  },
+  {
+    title: "学号",
+    dataIndex: "userCode",
+  },
+  {
+    title: "申请小组名",
+    dataIndex: "groupName",
+  },
+];
diff --git a/src/views/teacher/group/list/index.vue b/src/views/teacher/group/list/index.vue
index 4aa596c600cf2cce6d63e888c1f923c17baf3303..2f51573f786b36adf9abf566c61bb1d5eda74051 100644
--- a/src/views/teacher/group/list/index.vue
+++ b/src/views/teacher/group/list/index.vue
@@ -19,6 +19,11 @@
                 icon: 'clarity:note-edit-line',
                 onClick: handleEdit.bind(null, record),
               },
+              {
+                label: '管理',
+                icon: 'clarity:note-edit-line',
+                onClick: handleManage.bind(null, record),
+              },
               {
                 label: '删除',
                 color: 'error',
@@ -42,18 +47,19 @@
 <script lang="ts" setup>
   import GroupDesc from "./GroupDesc.vue";
   import GroupEdit from "./GroupEdit.vue";
-  import { tableColums } from "./group.data";
+  import { tableColumns } from "./group.data";
   import { useModal } from "/@/components/Modal";
   import { useMessage } from "/@/hooks/web/useMessage";
   import { TableOperEnum } from "/@/enums/tableOperEnum";
   import { defaultTableSettings } from "/@/hooks/core/useDefault";
   import { BasicTable, TableAction, useTable } from "/@/components/Table";
   import { getPracticalGroupPage, removePracticalGroupById } from "/@/api/teacher/practice";
+  import { useRouter } from "vue-router";
 
   const [registerTable] = useTable({
     title: "小组列表",
     rowKey: "groupId",
-    columns: tableColums,
+    columns: tableColumns,
     api: getPracticalGroupPage,
     ...defaultTableSettings,
   });
@@ -73,6 +79,14 @@
     openEditModal(true, { operType: TableOperEnum.SAVE });
   }
 
+  const router = useRouter();
+  function handleManage(record) {
+    router.push({
+      name: "GroupManage",
+      query: { groupId: record.groupId },
+    });
+  }
+
   const { createMessage } = useMessage();
   async function handleDelete(data) {
     await removePracticalGroupById(data.groupId);
diff --git a/src/views/teacher/group/manage/index.vue b/src/views/teacher/group/manage/index.vue
index aae97661d77ecc20ffa92082e6e5fd3648fefb34..7496140ca28af2da2b87a566da4147c3f7d6446a 100644
--- a/src/views/teacher/group/manage/index.vue
+++ b/src/views/teacher/group/manage/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="p-4">
     <BasicTable @register="registerTable">
+      <template #toolbar>
+        <a-button type="primary" @click="handleReturn">返回</a-button>
+      </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
@@ -9,12 +12,12 @@
               {
                 label: '个人信息',
                 icon: 'clarity:info-standard-line',
-                // onClick: handleDesc.bind(null, record),
+                onClick: handlePersonalInfo.bind(null, record),
               },
               {
                 label: '设为组长',
                 icon: 'clarity:success-standard-line',
-                // onClick: handleEdit.bind(null, record),
+                onClick: handleSetCaptain.bind(null, record),
               },
               {
                 label: '撤销组长',
@@ -24,7 +27,7 @@
                   title: '确认撤销？',
                   okText: '确认',
                   cancelText: '取消',
-                  confirm: handleDelete.bind(null, record),
+                  confirm: handleUnsetCaptain.bind(null, record),
                 },
               },
             ]"
@@ -32,37 +35,71 @@
         </template>
       </template>
     </BasicTable>
+    <PersonalDesc @register="registerPersonalInfoDescModal" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { tableColums } from "../list/group.data";
+  import { tableColumns } from "/@/views/teacher/practical/member/member.data";
   import { useMessage } from "/@/hooks/web/useMessage";
   import { defaultTableSettings } from "/@/hooks/core/useDefault";
   import { BasicTable, TableAction, useTable } from "/@/components/Table";
-  import { getPracticalGroupPage, removePracticalGroupById } from "/@/api/teacher/practice";
+  import { getUserInfoByUserId } from "/@/api/teacher/practice";
+  import { useRoute, useRouter } from "vue-router";
+  import { useModal } from "/@/components/Modal";
+  import PersonalDesc from "/@/views/teacher/practical/member/components/PersonalDesc.vue";
+  import { useTabs } from "/@/hooks/web/useTabs";
+
+  const router = useRouter();
+  const route = useRoute();
+  const { groupId } = route.query;
 
-  const [registerTable] = useTable({
-    title: "小组列表",
-    rowKey: "groupId",
-    columns: tableColums,
-    api: getPracticalGroupPage,
+  const [registerTable, { setLoading }] = useTable({
+    title: "小组成员",
+    rowKey: "userId",
+    columns: tableColumns,
+    beforeFetch(params) {
+      return { ...params, groupId };
+    },
+    api: getGroupMemberPageByGroupId,
     ...defaultTableSettings,
   });
 
-  /* const [registerDescModal, { openModal: openDescModal }] = useModal();
-  const [registerEditModal, { openModal: openEditModal }] = useModal();
+  const [registerPersonalInfoDescModal, { openModal: openPersonalInfoDescModal }] = useModal();
 
-  function handleDesc(data) {
-    openDescModal(true, data);
+  const { createMessage } = useMessage();
+  async function handlePersonalInfo(record) {
+    try {
+      setLoading(true);
+      const personalInfo = await getUserInfoByUserId(record.userId);
+      openPersonalInfoDescModal(true, personalInfo);
+    } finally {
+      setLoading(false);
+    }
+  }
+  async function handleSetCaptain(record) {
+    try {
+      setLoading(true);
+      await setCaptain(record.userId);
+      createMessage.success("设为小组长成功");
+    } finally {
+      setLoading(false);
+    }
   }
 
-  function handleEdit(data) {
-    openEditModal(true, { data, operType: TableOperEnum.UPDATE });
-  } */
+  async function handleUnsetCaptain(record) {
+    try {
+      setLoading(true);
+      await unsetCaptain(record.userId);
+      createMessage.success("撤销小组长成功");
+    } finally {
+      setLoading(false);
+    }
+  }
 
-  const { createMessage } = useMessage();
-  async function handleDelete(data) {
-    await removePracticalGroupById(data.groupId);
-    createMessage.info("删除小组成功");
+  const { closeCurrent } = useTabs();
+
+  function handleReturn() {
+    closeCurrent();
+    router.back();
   }
 </script>