From 660e6750daa683be0439bc4cef33b96e26a59a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= <lixg@dongwu-inc.com>
Date: Mon, 17 Oct 2022 16:52:29 +0800
Subject: [PATCH 01/10] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddVote.vue | 1 -
 src/views/system/SystemManage.vue  | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index c9061de7..b56b0324 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -2,7 +2,6 @@
   <a-drawer
     :visible="addvoteVisible"
     class="drawerStyle"
-    style="color: red"
     width="80%"
     title="添加投票"
     placement="right"
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index af79859e..4d32ae84 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -23,6 +23,7 @@
     <div>
       <add-vote v-model:addvoteVisible="visible" />
     </div>
+    <a-radio v-model:checked="checked" @click="changeRadio">Option A</a-radio>
   </div>
 </template>
 <script>
@@ -36,15 +37,19 @@ export default {
   setup() {
     const state = reactive({
       visible: false,
+      checked: true,
     });
 
     const showDrawer = () => {
       state.visible = true;
     };
-
+    const changeRadio = () => {
+      state.checked = false;
+    };
     return {
       ...toRefs(state),
       showDrawer,
+      changeRadio,
     };
   },
 };

From 8a232ed70c63e0d91c4d6a99b1f14ce39b107766 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Mon, 17 Oct 2022 18:34:26 +0800
Subject: [PATCH 02/10] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9EAddOnline=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue | 232 ++++++++
 src/views/projectcenter/TaskAdd.vue  | 829 +++++++++++++--------------
 2 files changed, 618 insertions(+), 443 deletions(-)
 create mode 100644 src/components/drawers/AddOnline.vue

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
new file mode 100644
index 00000000..772b81cf
--- /dev/null
+++ b/src/components/drawers/AddOnline.vue
@@ -0,0 +1,232 @@
+<template>
+    <a-drawer
+        :visible="addonlineVisible"
+        class="drawerStyle"
+        width="80%"
+        title="添加在线"
+        placement="right"
+        @after-visible-change="afterVisibleChange"
+    >
+        <div class="drawerMain">
+            <div class="header">
+                <div class="headerTitle">添加在线</div>
+                <img
+                    style="width: 29px; height: 29px; cursor: pointer"
+                    src="../../assets/images/basicinfo/close.png"
+                    @click="closeDrawer"
+                />
+            </div>
+            <div class="contentMain">
+                <div class="main_items">
+                    <div class="mi_ipts">
+                        <div class="mii_ipt">
+                            <div class="ipt_name">课程编号：</div>
+                            <div class="fi_input">
+                                <a-input
+                                    v-model:value="value1"
+                                    style="width: 270px; height: 40px; border-radius: 8px"
+                                    placeholder="请输入项目名称"
+                                />
+                            </div>
+                        </div>
+                        <div class="mii_ipt">
+                            <div class="ipt_name">内容分类：</div>
+                            <div class="select">
+                                <a-select
+                                dropdownClassName="dropdown-style"
+                                style="width: 200px"
+                                placeholder="请选择"
+                                :options="options1"
+                                allowClear
+                                showSearch
+                            />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mi_btns">
+                        <div class="btn btn1">
+                            <div class="search"></div>
+                            <div class="btnText">搜索</div>
+                        </div>
+                        <div class="btn btn2">
+                            <div class="search"></div>
+                            <div class="btnText">重置</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="main_notice">
+                    <div class="mntc_left">
+                        <div class="notice_icon"></div>
+                        <span style="color:rgba(0, 0, 0, .65); margin-right:17px;">已选择 <span style="color:#388BE1;">4</span> 项</span>
+                        <span style="color:rgba(0, 0, 0, .65)">列表选项总计：<span>14</span> 条</span>
+                    </div>
+                    <div class="mntc_right">
+                        <span style="color:#387DF7; margin-right:24px;">清空</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </a-drawer>
+</template>
+<script>
+import { reactive, toRefs, ref } from "vue";
+    const options1 = ref([
+            {
+                value: "value1",
+                label: "请选择状态",
+            },
+        ]);
+    export default {
+        name: "AddOnline",
+        props: {
+        addonlineVisible: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    setup(props, ctx) {
+        const state = reactive({});
+        const closeDrawer = () => {
+            ctx.emit("update:addonlineVisible", false);
+        };
+        const afterVisibleChange = (bool) => {
+            console.log("state", bool);
+        };
+        const showDrawerOnline = () => {
+            state.visible = true;
+        };
+
+        return {
+            ...toRefs(state),
+            afterVisibleChange,
+            showDrawerOnline,
+            closeDrawer,
+            options1,
+            // change,
+        };
+    },
+};
+</script>
+<style lang="scss">
+.drawerStyle {
+    .drawerMain {
+        .header {
+            height: 73px;
+            border-bottom: 1px solid #e8e8e8;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .headerTitle {
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            line-height: 25px;
+            margin-left: 24px;
+            }
+        }
+        .contentMain {
+            .main_items{
+                display: flex;
+                justify-content: space-between;
+                margin-bottom: 32px;
+                .mi_ipts{
+                    display: flex;
+                    .mii_ipt{
+                        display: flex;
+                        align-items: center;
+                        margin-right: 24px;
+                    }
+                }
+                .mi_btns{
+                    display: flex;
+                    margin-left: 38px;
+                    cursor: pointer;
+                    .btn {
+                        padding: 0px 26px 0px 26px;
+                        height: 38px;
+                        border-radius: 8px;
+                        border: 1px solid rgba(64, 158, 255, 1);
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        margin-left: 14px;
+                        flex-shrink: 0;
+                        .search {
+                        background-size: 100%;
+                        }
+                        .btnText {
+                        font-size: 14px;
+                        font-weight: 400;
+                        line-height: 36px;
+                        margin-left: 5px;
+                        }
+                    }
+                    .btn1 {
+                        background: rgb(64, 158, 255);
+                        .search {
+                        width: 15px;
+                        height: 17px;
+                        background-image: url("@/assets/images/coursewareManage/search0.png");
+                        }
+                        .btnText{
+                            color: rgb(255, 255, 255);
+                        }
+                    }
+                    .btn2 {
+                        background: rgb(255, 255, 255);
+                        .search {
+                        width: 15px;
+                        height: 17px;
+                        background-image: url("@/assets/images/coursewareManage/reset1.png");
+                        }
+                        .btnText{
+                            color: rgb(64, 158, 255);
+                        }
+                    }
+                    .btn1:hover {
+                        background: rgb(255, 255, 255);
+                        .search {
+                        background-image: url("@/assets/images/courseManage/search1.png");
+                        }
+                        .btnText {
+                        color: #388BE1;
+                        }
+                    }
+                    .btn2:hover {
+                        background: rgba(64, 158, 255, 1);
+                        .search {
+                        background-image: url("@/assets/images/courseManage/reset0.png");
+                        }
+                        .btnText {
+                        color: #ffffff;
+                        }
+                    }
+                }
+            }
+            .main_notice{
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 32px;
+                height: 40px;
+                background-color: #E9F6FE;
+                .mntc_left{
+                    display: flex;
+                    align-items: center;    
+                    .notice_icon{
+                        width: 14px;
+                        height: 14px;
+                        margin-right: 9px;
+                        margin-left: 9px;
+                        background-image: url(@/assets/images/coursewareManage/gan.png);
+                        background-size: 100% 100%;
+                    }
+                }
+                .mntc_right{
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 0bbd1138..338f6785 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -62,12 +62,17 @@
       </div>
       <div class="mid">
         <div class="item">
-          <div class="itcon">
+          <div class="itcon" @click="showDrawerOnline">
             <div class="img">
               <img src="../../assets/images/leveladd/zai.png" />
             </div>
-            <div class="text">在线</div>
+            <div class="text" >在线</div>
           </div>
+          <!-- 添加在线侧弹窗 -->
+          <div>
+              <add-online  v-model:addonlineVisible="visible" />
+          </div>
+          <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -222,42 +227,6 @@
           </div>
         </div>
       </div>
-      <div class="draw" style="position: relative">
-        <a-drawer
-          v-model:visible="visible"
-          class="drawerStyle"
-          title="关联项目"
-          placement="right"
-          width="80%"
-          @after-visible-change="afterVisibleChange"
-        >
-          <div class="drawerMain">
-            <div class="header">
-              <div class="headerTitle">关联项目</div>
-              <img
-                style="width: 29px; height: 29px; cursor: pointer"
-                src="../../assets/images/basicinfo/close.png"
-                @click="showDrawer"
-              />
-            </div>
-            <div class="drawerbox">
-              <a-table
-                :columns="drawercolumns"
-                :data-source="drawertableData"
-                :loading="tableDataTotal === -1 ? true : false"
-                :scroll="{ x: 700 }"
-                @expand="expandTable"
-                :pagination="false"
-              >
-              </a-table>
-            </div>
-            <div class="btnn">
-              <button @click="showDrawer" class="btn1">取消</button>
-              <button @click="showDrawer" class="btn2">确定</button>
-            </div>
-          </div>
-        </a-drawer>
-      </div>
     </div>
     <div>
       <a-modal
@@ -318,6 +287,7 @@
 
 <script>
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import AddOnline from "../../components/drawers/AddOnline.vue";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -357,431 +327,404 @@ const drawercolumns = [
   },
 ];
 export default {
-  name: "LevelAddDetail",
-  setup() {
-    const state = reactive({
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList2: [
-        {
-          id: 1,
-          value: "删除任务",
-          label: "删除任务",
-        },
-        {
-          id: 2,
-          value: "移动任务到关卡",
-          label: "移动任务到关卡",
-        },
-      ],
-      level: [
-        {
-          id: "1",
-          tit: "阶段1",
-          name: "腾飞班1基础",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "腾飞班基础",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "中级产品经理",
-        },
-      ],
-      tableData: [
-        {
-          key: 1,
-          lei: "在线",
-          // state: "已发布",
-          creater: "管理者课程",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 2,
-          lei: "面授",
-          // state: "草稿",
-          creater: "管理者面授",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 1,
-          lei: "在线",
-          // state: "已发布",
-          creater: "管理者课程",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 3,
-          lei: "作业",
-          // state: "已停用",
-          creater: "管理者作业",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 4,
-          lei: "考试",
-          // state: "草稿",
-          creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 5,
-          lei: "案例",
-          // state: "草稿",
-          creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: true,
-          checkedd: false,
-        },
-        {
-          key: 4,
-          lei: "考试",
-          // state: "草稿",
-          creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 5,
-          lei: "案例",
-          // state: "草稿",
-          creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: true,
-          checkedd: false,
-        },
-      ],
-      drawertableData: [
-        {
-          key: 1,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-          children: [
-            {
-              key: "1-1",
-              projectName: "管理者进阶-腾飞班",
-              manager: "黄华  刘俊",
-
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-              children: [
+    name: "LevelAddDetail",
+    components: {
+      AddOnline,
+    },
+    setup() {
+        const state = reactive({
+            projectNameList: [
                 {
-                  key: "1-1-1",
-                  projectName: "管理者进阶-腾飞班K1",
-                  manager: "黄华  刘俊",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
+                    id: 1,
+                    value: "项目一",
+                    label: "项目一",
                 },
-              ],
-            },
-          ],
-        },
-        {
-          key: 2,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-          children: [
-            {
-              key: "2-1",
-              projectName: "管理者进阶-腾飞班",
-              manager: "黄华  刘俊",
-
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-              children: [
                 {
-                  key: "2-1-1",
-                  projectName: "管理者进阶-腾飞班K1",
-                  manager: "黄华  刘俊",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
+                    id: 2,
+                    value: "项目二",
+                    label: "项目二",
                 },
-              ],
-            },
-          ],
-        },
-
-        {
-          key: 3,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
-
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
-
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 5,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
-
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 6,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
-
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 7,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
-
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-      ],
-      currentPage: 1,
-      tableDataTotal: 100,
-      pageSize: 10,
-      visible: false,
-      stage: false,
-      selectedRowKeys: [],
-    });
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName2 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const showDrawer = () => {
-      state.visible = !state.visible;
-    };
-    const afterVisibleChange = (bool) => {
-      console.log("visible", bool);
-    };
-    const tableDataFunc = () => {
-      const columns = [
-        {
-          title: "类型",
-          dataIndex: "state",
-          // width: "30%",
-          key: "state",
-          width: 60,
-          align: "left",
-          className: "classify",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="racona">
-                <div
-                  class="img"
-                  style={{ cursor: "pointer" }}
-                  onClick={() => {
-                    console.log("点击了");
-                  }}
-                ></div>
+                {
+                    id: 3,
+                    value: "项目三",
+                    label: "项目三",
+                },
+                {
+                    id: 4,
+                    value: "项目四",
+                    label: "项目四",
+                },
+            ],
+            projectNameList2: [
+                {
+                    id: 1,
+                    value: "删除任务",
+                    label: "删除任务",
+                },
+                {
+                    id: 2,
+                    value: "移动任务到关卡",
+                    label: "移动任务到关卡",
+                },
+            ],
+            level: [
+                {
+                    id: "1",
+                    tit: "阶段1",
+                    name: "腾飞班1基础",
+                },
+                {
+                    id: "2",
+                    tit: "阶段2",
+                    name: "腾飞班基础",
+                },
+                {
+                    id: "2",
+                    tit: "阶段2",
+                    name: "中级产品经理",
+                },
+                {
+                    id: "2",
+                    tit: "阶段2",
+                    name: "中级产品经理",
+                },
+                {
+                    id: "2",
+                    tit: "阶段2",
+                    name: "中级产品经理",
+                },
+            ],
+            tableData: [
+                {
+                    key: 1,
+                    lei: "在线",
+                    // state: "已发布",
+                    creater: "管理者课程",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "60分钟",
+                    haspub: false,
+                    checked1: false,
+                    checkedd: false,
+                },
+                {
+                    key: 2,
+                    lei: "面授",
+                    // state: "草稿",
+                    creater: "管理者面授",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "20分钟",
+                    haspub: true,
+                    checked1: false,
+                    checkedd: false,
+                },
+                {
+                    key: 1,
+                    lei: "在线",
+                    // state: "已发布",
+                    creater: "管理者课程",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "60分钟",
+                    haspub: false,
+                    checked1: false,
+                    checkedd: false,
+                },
+                {
+                    key: 3,
+                    lei: "作业",
+                    // state: "已停用",
+                    creater: "管理者作业",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "60分钟",
+                    haspub: false,
+                    checked1: false,
+                    checkedd: false,
+                },
+                {
+                    key: 4,
+                    lei: "考试",
+                    // state: "草稿",
+                    creater: "管理者考试",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "20分钟",
+                    haspub: true,
+                    checked1: false,
+                    checkedd: false,
+                },
+                {
+                    key: 5,
+                    lei: "案例",
+                    // state: "草稿",
+                    creater: "腾飞班1案例",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "20分钟",
+                    haspub: true,
+                    checked1: true,
+                    checkedd: false,
+                },
+                {
+                    key: 4,
+                    lei: "考试",
+                    // state: "草稿",
+                    creater: "管理者考试",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "20分钟",
+                    haspub: true,
+                    checked1: false,
+                    checkedd: false,
+                },
+                {
+                    key: 5,
+                    lei: "案例",
+                    // state: "草稿",
+                    creater: "腾飞班1案例",
+                    // pubtime: "2022-07-20 14:00:03",
+                    cretime: "20分钟",
+                    haspub: true,
+                    checked1: true,
+                    checkedd: false,
+                },
+            ],
+            drawertableData: [
+                {
+                    key: 1,
+                    projectName: "管理者进阶",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                    children: [
+                        {
+                            key: "1-1",
+                            projectName: "管理者进阶-腾飞班",
+                            manager: "黄华  刘俊",
+                            creater: "毛继禹",
+                            time: "2022-07-20 14:00:03",
+                            children: [
+                                {
+                                    key: "1-1-1",
+                                    projectName: "管理者进阶-腾飞班K1",
+                                    manager: "黄华  刘俊",
+                                    creater: "毛继禹",
+                                    time: "2022-07-20 14:00:03",
+                                },
+                            ],
+                        },
+                    ],
+                },
+                {
+                    key: 2,
+                    projectName: "管理者进阶",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                    children: [
+                        {
+                            key: "2-1",
+                            projectName: "管理者进阶-腾飞班",
+                            manager: "黄华  刘俊",
+                            creater: "毛继禹",
+                            time: "2022-07-20 14:00:03",
+                            children: [
+                                {
+                                    key: "2-1-1",
+                                    projectName: "管理者进阶-腾飞班K1",
+                                    manager: "黄华  刘俊",
+                                    creater: "毛继禹",
+                                    time: "2022-07-20 14:00:03",
+                                },
+                            ],
+                        },
+                    ],
+                },
+                {
+                    key: 3,
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                },
+                {
+                    key: 4,
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                },
+                {
+                    key: 5,
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                },
+                {
+                    key: 6,
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                },
+                {
+                    key: 7,
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                },
+            ],
+            currentPage: 1,
+            tableDataTotal: 100,
+            pageSize: 10,
+            visible: false,
+            stage: false,
+            selectedRowKeys: [],
+        });
+        const selectProjectName = (value, index) => {
+            console.log("value", value, index);
+        };
+        const selectProjectName2 = (value, index) => {
+            console.log("value", value, index);
+        };
+        const afterVisibleChange = (bool) => {
+            console.log("visible", bool);
+        };
+        const tableDataFunc = () => {
+            const columns = [
+                {
+                    title: "类型",
+                    dataIndex: "state",
+                    // width: "30%",
+                    key: "state",
+                    width: 60,
+                    align: "left",
+                    className: "classify",
+                    scopedSlots: { customRender: "action" },
+                    customRender: (text) => {
+                        // console.log(text.record.checked1);
+                        return (<div class="racona">
+                <div class="img" style={{ cursor: "pointer" }} onClick={() => {
+                                console.log("点击了");
+                            }}></div>
                 <span> {text.record.lei}</span>
 
                 {/**
-								<div class="img"></div>
-                <a-checkbox class="ch" checked={text.record.checkedd}>
-                  {text.record.lei}
-                </a-checkbox>
-*/}
-              </div>
-            );
-          },
-        },
-        {
-          title: "任务名称",
-          dataIndex: "creater",
-          // width: "30%",
-          key: "creater",
-          width: 200,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "必修/选修",
-          dataIndex: "pubtime",
-          key: "pubtime",
-          // width: 100,
-          align: "center",
-          className: "h",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="opat">
+                                            <div class="img"></div>
+                            <a-checkbox class="ch" checked={text.record.checkedd}>
+                              {text.record.lei}
+                            </a-checkbox>
+            */}
+              </div>);
+                    },
+                },
+                {
+                    title: "任务名称",
+                    dataIndex: "creater",
+                    // width: "30%",
+                    key: "creater",
+                    width: 200,
+                    align: "center",
+                    className: "h",
+                },
+                {
+                    title: "必修/选修",
+                    dataIndex: "pubtime",
+                    key: "pubtime",
+                    // width: 100,
+                    align: "center",
+                    className: "h",
+                    scopedSlots: { customRender: "action" },
+                    customRender: (text) => {
+                        // console.log(text.record.checked1);
+                        return (<div class="opat">
                 <div class="opacationt clearfix">
-                  <a-switch
-                    style="margin-left:-50px;margin-top:3px"
-                    checked={text.record.checked1}
-                    size="small"
-                    active-color="red"
-                    onClick={() => {
-                      console.log("点击了");
-                      text.record.checked1 = !text.record.checked1;
-                    }}
-                  />
+                  <a-switch style="margin-left:-50px;margin-top:3px" checked={text.record.checked1} size="small" active-color="red" onClick={() => {
+                                console.log("点击了");
+                                text.record.checked1 = !text.record.checked1;
+                            }}/>
                   <div class="showt clearfix">
-                    <div
-                      class="bi"
-                      style={
-                        text.record.checked1 ? "z-index:999" : "z-index:998"
-                      }
-                    >
+                    <div class="bi" style={text.record.checked1 ? "z-index:999" : "z-index:998"}>
                       必修
                     </div>
                     <div class="xuan">选修</div>
                   </div>
                 </div>
-              </div>
-            );
-          },
-        },
-        {
-          title: "时长",
-          dataIndex: "cretime",
-          key: "cretime",
-          // width: 100,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "操作",
-          className: "h",
-          dataIndex: "opacation",
-          key: "opacation",
-          // width: 100,
-          align: "center",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: () => {
-            return (
-              <div class="opa">
+              </div>);
+                    },
+                },
+                {
+                    title: "时长",
+                    dataIndex: "cretime",
+                    key: "cretime",
+                    // width: 100,
+                    align: "center",
+                    className: "h",
+                },
+                {
+                    title: "操作",
+                    className: "h",
+                    dataIndex: "opacation",
+                    key: "opacation",
+                    // width: 100,
+                    align: "center",
+                    scopedSlots: { customRender: "action" },
+                    customRender: () => {
+                        return (<div class="opa">
                 <div class="opacation">
                   <span style="color:#4EA6FF;margin-right:25px;cursor:pointer">
                     编辑
                   </span>
                   <span style="color:#4EA6FF;cursor:pointer">删除</span>
                 </div>
-              </div>
-            );
-          },
-        },
-      ];
-      return columns;
-    };
-
-    const onSelectChange = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
-    };
-
-    // const getClientHeight = () => {
-    //   state.rightheight =
-    //     document.getElementsByClassName("addhead")[0].offsetHeight +
-    //     document.getElementsByClassName("mid")[0].offsetHeight +
-    //     document.getElementsByClassName("boom")[0].offsetHeight +
-    //     40 +
-    //     "px";
-    // };
-    const showModal = () => {
-      state.stage = true;
-    };
-    const closeModal = () => {
-      state.stage = false;
-    };
-    onMounted(() => {
-      document.getElementsByTagName("main")[0].style.background =
-        "rgb(245, 247, 250,1)";
-      document.getElementsByTagName("main")[0].style.boxShadow = "none";
-    });
-    onUnmounted(() => {
-      document.getElementsByTagName("main")[0].style.background = "#ffffff";
-      document.getElementsByTagName("main")[0].style.boxShadow =
-        "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
-    });
-    return {
-      ...toRefs(state),
-      selectProjectName,
-      selectProjectName2,
-      tableDataFunc,
-      showModal,
-      closeModal,
-      showDrawer,
-      afterVisibleChange,
-      drawercolumns,
-      onSelectChange,
-    };
-  },
+              </div>);
+                    },
+                },
+            ];
+            return columns;
+        };
+        const onSelectChange = (selectedRowKeys) => {
+            console.log("selectedRowKeys changed: ", selectedRowKeys);
+            state.selectedRowKeys = selectedRowKeys;
+        };
+        // const getClientHeight = () => {
+        //   state.rightheight =
+        //     document.getElementsByClassName("addhead")[0].offsetHeight +
+        //     document.getElementsByClassName("mid")[0].offsetHeight +
+        //     document.getElementsByClassName("boom")[0].offsetHeight +
+        //     40 +
+        //     "px";
+        // };
+        const showModal = () => {
+            state.stage = true;
+        };
+        const closeModal = () => {
+            state.stage = false;
+        };
+        onMounted(() => {
+            document.getElementsByTagName("main")[0].style.background =
+                "rgb(245, 247, 250,1)";
+            document.getElementsByTagName("main")[0].style.boxShadow = "none";
+        });
+        onUnmounted(() => {
+            document.getElementsByTagName("main")[0].style.background = "#ffffff";
+            document.getElementsByTagName("main")[0].style.boxShadow =
+                "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
+        });
+        const showDrawerOnline = () => {
+            state.visible = true;
+        };
+        return {
+            ...toRefs(state),
+            selectProjectName,
+            selectProjectName2,
+            tableDataFunc,
+            showModal,
+            closeModal,
+            // showDrawer,
+            afterVisibleChange,
+            drawercolumns,
+            onSelectChange,
+            showDrawerOnline,
+        };
+    },
 };
 </script>
 

From 2fa9bc6228ed01f6739c6ac1f29e40a1f05a386e Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Mon, 17 Oct 2022 18:50:27 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:addonline(=E6=9C=AA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue | 33 +++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 772b81cf..9bf68249 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -64,6 +64,9 @@
                         <span style="color:#387DF7; margin-right:24px;">清空</span>
                     </div>
                 </div>
+                <div class="main_table">
+                    <a-table :row-selection="rowSelection" :columns="columns1" :data-source="tableData1"></a-table>
+                </div>
             </div>
         </div>
     </a-drawer>
@@ -75,7 +78,24 @@ import { reactive, toRefs, ref } from "vue";
                 value: "value1",
                 label: "请选择状态",
             },
-        ]);
+    ]);
+    const columns1 = [
+        {
+            title: "课程编号",
+            width: 100,
+            dataIndex: "num",
+            key: "num",
+            align: "center",
+        },
+        {
+            title: "名称",
+            width: 200,
+            dataIndex: "name",
+            key: "name",
+            ellipsis: true,
+            align: "center",
+        },
+    ]
     export default {
         name: "AddOnline",
         props: {
@@ -85,7 +105,14 @@ import { reactive, toRefs, ref } from "vue";
         },
     },
     setup(props, ctx) {
-        const state = reactive({});
+        const state = reactive({
+            tableData1: [
+                    {
+                key: "1",
+                num: 1,
+                },
+            ]
+        });
         const closeDrawer = () => {
             ctx.emit("update:addonlineVisible", false);
         };
@@ -95,13 +122,13 @@ import { reactive, toRefs, ref } from "vue";
         const showDrawerOnline = () => {
             state.visible = true;
         };
-
         return {
             ...toRefs(state),
             afterVisibleChange,
             showDrawerOnline,
             closeDrawer,
             options1,
+            columns1,
             // change,
         };
     },

From 93c8ca9879086d6941f6efc8173de8befdabd438 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 18 Oct 2022 09:39:05 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97AddOnline?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue | 198 +++++++++++++++++++++++++--
 1 file changed, 190 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 9bf68249..0fd2359f 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -65,7 +65,36 @@
                     </div>
                 </div>
                 <div class="main_table">
-                    <a-table :row-selection="rowSelection" :columns="columns1" :data-source="tableData1"></a-table>
+                    <a-table class="ant-table-striped" 
+                        :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" 
+                        :row-selection="rowSelection" 
+                        :columns="columns1" 
+                        :data-source="tableData1"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        :pagination="{
+                            showSizeChanger: true,
+                            showQuickJumper: true,
+                            hideOnSinglePage: true,
+                            pageSizeOptions: [],
+                            pageSize: pageSize,
+                            current: currentPage,
+                            total: tableDataTotal,
+                            onChange: (page, pageSize) => {
+                            currentPage = page;
+                            // console.log('page', page)
+                            // 加翻页查找代码
+                            // 	this.setState({
+                            // 		currentPage: page,
+                            // 	}, () => {
+                            // 		this.getMilitaryDeployment()
+                            // 	})
+                            },
+                        }"
+                    />
+                </div>
+                <div class="main_btns">
+                    <button class="btn1">取消</button>
+                    <button class="btn2">确定</button>
                 </div>
             </div>
         </div>
@@ -82,20 +111,59 @@ import { reactive, toRefs, ref } from "vue";
     const columns1 = [
         {
             title: "课程编号",
-            width: 100,
+            width: '20%',
             dataIndex: "num",
             key: "num",
             align: "center",
         },
         {
             title: "名称",
-            width: 200,
+            width: '20%',
             dataIndex: "name",
             key: "name",
-            ellipsis: true,
+            align: "center",
+        },
+        {
+            title: "内容分类",
+            width: '13%',
+            dataIndex: "content",
+            key: "content",
+            align: "center",
+        },
+        {
+            title: "授课教师",
+            width: '13%',
+            dataIndex: "teacher",
+            key: "teacher",
+            align: "center",
+        },
+        {
+            title: "创建人",
+            width: '13%',
+            dataIndex: "creator",
+            key: "creator",
+            align: "center",
+        },
+        {
+            title: "完成时间",
+            width: '20%',
+            dataIndex: "time",
+            key: "time",
             align: "center",
         },
     ]
+    const rowSelection = ref({
+        checkStrictly: false,
+        onChange: (selectedRowKeys, selectedRows) => {
+            console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+        },
+        onSelect: (record, selected, selectedRows) => {
+            console.log(record, selected, selectedRows);
+        },
+        onSelectAll: (selected, selectedRows, changeRows) => {
+            console.log(selected, selectedRows, changeRows);
+        },
+    });
     export default {
         name: "AddOnline",
         props: {
@@ -107,11 +175,91 @@ import { reactive, toRefs, ref } from "vue";
     setup(props, ctx) {
         const state = reactive({
             tableData1: [
-                    {
-                key: "1",
-                num: 1,
+                {
+                    key: "1",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'通用力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
                 },
-            ]
+                {
+                    key: "2",
+                    num: 'JDF2022071100001',
+                    name:'管理能力课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "3",
+                    num: 'JDF2022071100001',
+                    name:'快速换模SMED',
+                    content:'通用力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "4",
+                    num: 'JDF2022071100001',
+                    name:'巧妙对话人见人夸',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "5",
+                    num: 'JDF2022071100001',
+                    name:'管理能力课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "6",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "7",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "8",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "9",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+            ],
+            currentPage: 1,
+            tableDataTotal: 100,
+            pageSize: 10,
         });
         const closeDrawer = () => {
             ctx.emit("update:addonlineVisible", false);
@@ -129,12 +277,16 @@ import { reactive, toRefs, ref } from "vue";
             closeDrawer,
             options1,
             columns1,
+            rowSelection,
             // change,
         };
     },
 };
 </script>
 <style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
 .drawerStyle {
     .drawerMain {
         .header {
@@ -253,6 +405,36 @@ import { reactive, toRefs, ref } from "vue";
                     cursor: pointer;
                 }
             }
+            .main_btns{
+                height: 72px;
+                width: 100%;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+                .btn1 {
+                    width: 100px;
+                    height: 40px;
+                    border: 1px solid #4ea6ff;
+                    border-radius: 8px;
+                    color: #4ea6ff;
+                    background-color: #fff;
+                    cursor: pointer;
+                }
+                .btn2 {
+                    cursor: pointer;
+                    width: 100px;
+                    height: 40px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    border: 0;
+                    margin-left: 15px;
+                    color: #fff;
+                }
+            }
         }
     }
 }

From fc45ee33909f8d0bc23d8a3500ccec9a618bfede Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 18 Oct 2022 10:25:14 +0800
Subject: [PATCH 05/10] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/EidtOnline.vue        | 441 +++++++++++++++++++
 src/views/courselibrary/CoursewareManage.vue |  65 ++-
 src/views/projectcenter/TaskAdd.vue          |  13 +-
 3 files changed, 514 insertions(+), 5 deletions(-)
 create mode 100644 src/components/drawers/EidtOnline.vue

diff --git a/src/components/drawers/EidtOnline.vue b/src/components/drawers/EidtOnline.vue
new file mode 100644
index 00000000..6babc1ec
--- /dev/null
+++ b/src/components/drawers/EidtOnline.vue
@@ -0,0 +1,441 @@
+<template>
+    <a-drawer
+        :visible="editonlineVisible"
+        class="drawerStyle"
+        width="80%"
+        title="添加在线"
+        placement="right"
+        @after-visible-change="afterVisibleChange"
+    >
+        <div class="drawerMain">
+            <div class="header">
+                <div class="headerTitle">添加在线</div>
+                <img
+                    style="width: 29px; height: 29px; cursor: pointer"
+                    src="../../assets/images/basicinfo/close.png"
+                    @click="closeDrawer"
+                />
+            </div>
+            <div class="contentMain">
+                <div class="main_items">
+                    <div class="mi_ipts">
+                        <div class="mii_ipt">
+                            <div class="ipt_name">课程编号：</div>
+                            <div class="fi_input">
+                                <a-input
+                                    v-model:value="value1"
+                                    style="width: 270px; height: 40px; border-radius: 8px"
+                                    placeholder="请输入项目名称"
+                                />
+                            </div>
+                        </div>
+                        <div class="mii_ipt">
+                            <div class="ipt_name">内容分类：</div>
+                            <div class="select">
+                                <a-select
+                                dropdownClassName="dropdown-style"
+                                style="width: 200px"
+                                placeholder="请选择"
+                                :options="options1"
+                                allowClear
+                                showSearch
+                            />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mi_btns">
+                        <div class="btn btn1">
+                            <div class="search"></div>
+                            <div class="btnText">搜索</div>
+                        </div>
+                        <div class="btn btn2">
+                            <div class="search"></div>
+                            <div class="btnText">重置</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="main_notice">
+                    <div class="mntc_left">
+                        <div class="notice_icon"></div>
+                        <span style="color:rgba(0, 0, 0, .65); margin-right:17px;">已选择 <span style="color:#388BE1;">4</span> 项</span>
+                        <span style="color:rgba(0, 0, 0, .65)">列表选项总计：<span>14</span> 条</span>
+                    </div>
+                    <div class="mntc_right">
+                        <span style="color:#387DF7; margin-right:24px;">清空</span>
+                    </div>
+                </div>
+                <div class="main_table">
+                    <a-table class="ant-table-striped" 
+                        :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" 
+                        :row-selection="rowSelection" 
+                        :columns="columns1" 
+                        :data-source="tableData1"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        :pagination="{
+                            showSizeChanger: true,
+                            showQuickJumper: true,
+                            hideOnSinglePage: true,
+                            pageSizeOptions: [],
+                            pageSize: pageSize,
+                            current: currentPage,
+                            total: tableDataTotal,
+                            onChange: (page, pageSize) => {
+                            currentPage = page;
+                            // console.log('page', page)
+                            // 加翻页查找代码
+                            // 	this.setState({
+                            // 		currentPage: page,
+                            // 	}, () => {
+                            // 		this.getMilitaryDeployment()
+                            // 	})
+                            },
+                        }"
+                    />
+                </div>
+                <div class="main_btns">
+                    <button class="btn1">取消</button>
+                    <button class="btn2">确定</button>
+                </div>
+            </div>
+        </div>
+    </a-drawer>
+</template>
+<script>
+import { reactive, toRefs, ref } from "vue";
+    const options1 = ref([
+            {
+                value: "value1",
+                label: "请选择状态",
+            },
+    ]);
+    const columns1 = [
+        {
+            title: "课程编号",
+            width: '20%',
+            dataIndex: "num",
+            key: "num",
+            align: "center",
+        },
+        {
+            title: "名称",
+            width: '20%',
+            dataIndex: "name",
+            key: "name",
+            align: "center",
+        },
+        {
+            title: "内容分类",
+            width: '13%',
+            dataIndex: "content",
+            key: "content",
+            align: "center",
+        },
+        {
+            title: "授课教师",
+            width: '13%',
+            dataIndex: "teacher",
+            key: "teacher",
+            align: "center",
+        },
+        {
+            title: "创建人",
+            width: '13%',
+            dataIndex: "creator",
+            key: "creator",
+            align: "center",
+        },
+        {
+            title: "完成时间",
+            width: '20%',
+            dataIndex: "time",
+            key: "time",
+            align: "center",
+        },
+    ]
+    const rowSelection = ref({
+        checkStrictly: false,
+        onChange: (selectedRowKeys, selectedRows) => {
+            console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+        },
+        onSelect: (record, selected, selectedRows) => {
+            console.log(record, selected, selectedRows);
+        },
+        onSelectAll: (selected, selectedRows, changeRows) => {
+            console.log(selected, selectedRows, changeRows);
+        },
+    });
+    export default {
+        name: "EditOnline",
+        props: {
+        editonlineVisible: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    setup(props, ctx) {
+        const state = reactive({
+            tableData1: [
+                {
+                    key: "1",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'通用力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "2",
+                    num: 'JDF2022071100001',
+                    name:'管理能力课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "3",
+                    num: 'JDF2022071100001',
+                    name:'快速换模SMED',
+                    content:'通用力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "4",
+                    num: 'JDF2022071100001',
+                    name:'巧妙对话人见人夸',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "5",
+                    num: 'JDF2022071100001',
+                    name:'管理能力课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "6",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "7",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "8",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "9",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+            ],
+            currentPage: 1,
+            tableDataTotal: 100,
+            pageSize: 10,
+        });
+        // const closeDrawer = () => {
+        //     ctx.emit("update:addonlineVisible", false);
+        // };
+        // const afterVisibleChange = (bool) => {
+        //     console.log("state", bool);
+        // };
+        // const showDrawerOnline = () => {
+        //     state.visible = true;
+        // };
+        return {
+            ...toRefs(state),
+            afterVisibleChange,
+            showDrawerOnline,
+            closeDrawer,
+            options1,
+            columns1,
+            rowSelection,
+            // change,
+        };
+    },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+.drawerStyle {
+    .drawerMain {
+        .header {
+            height: 73px;
+            border-bottom: 1px solid #e8e8e8;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .headerTitle {
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            line-height: 25px;
+            margin-left: 24px;
+            }
+        }
+        .contentMain {
+            .main_items{
+                display: flex;
+                justify-content: space-between;
+                margin-bottom: 32px;
+                .mi_ipts{
+                    display: flex;
+                    .mii_ipt{
+                        display: flex;
+                        align-items: center;
+                        margin-right: 24px;
+                    }
+                }
+                .mi_btns{
+                    display: flex;
+                    margin-left: 38px;
+                    cursor: pointer;
+                    .btn {
+                        padding: 0px 26px 0px 26px;
+                        height: 38px;
+                        border-radius: 8px;
+                        border: 1px solid rgba(64, 158, 255, 1);
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        margin-left: 14px;
+                        flex-shrink: 0;
+                        .search {
+                        background-size: 100%;
+                        }
+                        .btnText {
+                        font-size: 14px;
+                        font-weight: 400;
+                        line-height: 36px;
+                        margin-left: 5px;
+                        }
+                    }
+                    .btn1 {
+                        background: rgb(64, 158, 255);
+                        .search {
+                        width: 15px;
+                        height: 17px;
+                        background-image: url("@/assets/images/coursewareManage/search0.png");
+                        }
+                        .btnText{
+                            color: rgb(255, 255, 255);
+                        }
+                    }
+                    .btn2 {
+                        background: rgb(255, 255, 255);
+                        .search {
+                        width: 15px;
+                        height: 17px;
+                        background-image: url("@/assets/images/coursewareManage/reset1.png");
+                        }
+                        .btnText{
+                            color: rgb(64, 158, 255);
+                        }
+                    }
+                    .btn1:hover {
+                        background: rgb(255, 255, 255);
+                        .search {
+                        background-image: url("@/assets/images/courseManage/search1.png");
+                        }
+                        .btnText {
+                        color: #388BE1;
+                        }
+                    }
+                    .btn2:hover {
+                        background: rgba(64, 158, 255, 1);
+                        .search {
+                        background-image: url("@/assets/images/courseManage/reset0.png");
+                        }
+                        .btnText {
+                        color: #ffffff;
+                        }
+                    }
+                }
+            }
+            .main_notice{
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 32px;
+                height: 40px;
+                background-color: #E9F6FE;
+                .mntc_left{
+                    display: flex;
+                    align-items: center;    
+                    .notice_icon{
+                        width: 14px;
+                        height: 14px;
+                        margin-right: 9px;
+                        margin-left: 9px;
+                        background-image: url(@/assets/images/coursewareManage/gan.png);
+                        background-size: 100% 100%;
+                    }
+                }
+                .mntc_right{
+                    cursor: pointer;
+                }
+            }
+            .main_btns{
+                height: 72px;
+                width: 100%;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+                .btn1 {
+                    width: 100px;
+                    height: 40px;
+                    border: 1px solid #4ea6ff;
+                    border-radius: 8px;
+                    color: #4ea6ff;
+                    background-color: #fff;
+                    cursor: pointer;
+                }
+                .btn2 {
+                    cursor: pointer;
+                    width: 100px;
+                    height: 40px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    border: 0;
+                    margin-left: 15px;
+                    color: #fff;
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 6424a0f1..569cf566 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -697,13 +697,70 @@
                   <div class="bs_left">状态：</div>
                   <div class="bs_right">已审核</div>
                 </div>
-                <div class="b_menu">
+                <a-tabs
+                    class="b_menu"
+                    v-model:activeKey="activeKey"
+                    size="large"
+                    :tabBarStyle="{ marginLeft: '10px' }"
+                >
+                  <a-tab-pane key="1" tab="报名管理">
+                      1
+                  </a-tab-pane>
+                  <a-tab-pane key="2" tab="学习记录">
+                    <div class="b_menunav">
+                      <div class="bm_select">
+                        <a-select
+                          class="select"
+                          ref="select"
+                          placeholder="请选择状态"
+                          v-model:value="value14"
+                          style="width: 200px"
+                          @focus="focus"
+                          @change="handleChange"
+                        >
+                          <a-select-option value="status">状态</a-select-option>
+                          <a-select-option value="passed">已通过</a-select-option>
+                          <a-select-option value="weishenhe">未审核</a-select-option>
+                          <a-select-option value="reject">管理员拒绝</a-select-option>
+                        </a-select>
+                      </div>
+                      <div class="bm_input">
+                        <a-input
+                          v-model:value="value15"
+                          style="width: 200px; height: 40px; border-radius: 8px"
+                          placeholder="姓名"
+                        />
+                      </div>
+                      <div class="bm_btn">
+                        <div class="btn btn1">
+                          <div class="search"></div>
+                          <div class="btnText">搜索</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="bm_table" style="margin-bottom: 20px">
+                      <a-table
+                        :columns="columns2"
+                        :data-source="tableData3"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        :pagination="false"
+                      >
+                        <template #bodyCell="{ column }">
+                          <template v-if="column.key === 'opacation'">
+                            <a @click="ckxq_hs">查看详情</a>
+                          </template>
+                        </template>
+                      </a-table>
+                    </div>
+                  </a-tab-pane>
+                </a-tabs>
+                <!-- <div class="b_menu">
                   <a-menu v-model:selectedKeys="current" mode="horizontal">
                     <a-menu-item key="mail"> 报名管理 </a-menu-item>
                     <a-menu-item key="sub2"> 学习记录 </a-menu-item>
                   </a-menu>
-                </div>
-                <div class="b_menunav">
+                </div> -->
+                <!-- <div class="b_menunav">
                   <div class="bm_select">
                     <a-select
                       class="select"
@@ -747,7 +804,7 @@
                       </template>
                     </template>
                   </a-table>
-                </div>
+                </div> -->
               </div>
             </div>
           </div>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 338f6785..855b3f0a 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -225,6 +225,11 @@
               />
             </div>
           </div>
+          <!-- 编辑在线侧弹窗 -->
+          <div>
+            <add-online  v-model:addonlineVisible="visible" />
+          </div>
+          <!-- 编辑在线侧弹窗 -->
         </div>
       </div>
     </div>
@@ -575,6 +580,7 @@ export default {
             tableDataTotal: 100,
             pageSize: 10,
             visible: false,
+            visible2:false,
             stage: false,
             selectedRowKeys: [],
         });
@@ -669,7 +675,12 @@ export default {
                     customRender: () => {
                         return (<div class="opa">
                 <div class="opacation">
-                  <span style="color:#4EA6FF;margin-right:25px;cursor:pointer">
+                  <span
+                    onClick={() => {
+                      state.visible2 = true;
+                    }}
+                    style="color:#4EA6FF;margin-right:25px;cursor:pointer"
+                  >
                     编辑
                   </span>
                   <span style="color:#4EA6FF;cursor:pointer">删除</span>

From 03eb4686aaafad8511f8ab1cbb81736a5e6798ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 18 Oct 2022 10:32:03 +0800
Subject: [PATCH 06/10] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 313 ++++++++++++++++++++++++++-
 1 file changed, 305 insertions(+), 8 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 46e1a5c1..5a595afd 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -363,7 +363,7 @@
                                 </div>                                                  
                             </div>
                             <div class="second2">
-                                <div class="btn1">
+                                <div class="btn1" @click="showModal2">
                                         <img src="../../assets/images/courseManage/search0.png"/>
                                         <span class="btn1text">创建小组</span>
                                     </div>
@@ -377,7 +377,22 @@
                                     <div style="width: 90%">
                                         <div class="grouptitle">
                                             <div class="goodgruop">好好学习小组</div>
-                                            <div>...</div>
+                                            <div class="more">
+                                                <span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
+                                                <div class="moreItems">
+                                                    <div class="sammo">编辑</div>
+                                                    <div class="sammo">删除</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="leader">组长：小李</div>
+                                        <div class="grocenter">
+                                            <div class="leader1">进度</div>
+                                            <a-progress :percent="55" />
+                                        </div>
+                                        <div class="grofooter">
+                                            <div class="ftext">组员名单 ></div>
+                                            <div></div>
                                         </div>
                                     </div>
                                 </div>
@@ -399,7 +414,7 @@
     <time-manage v-model:Tvisible="visible" />
     <!-- 面授管理抽屉 -->
     <face-manage v-model:Fvisible="FaceVisivle" />
-<!-- 项目发布弹窗 -->
+<!-- 概览（无数据）-项目发布弹窗 -->
     <div>
         <a-modal
             v-model:visible="pubproject"
@@ -453,7 +468,105 @@
             </div>
         </a-modal>
     </div>
-<!-- 项目发布弹窗 -->
+<!-- 概览（无数据）-项目发布弹窗 -->
+<!-- 学员-创建小组弹窗 -->
+<div>
+      <a-modal
+        v-model:visible="stugroup"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublepro"
+        width="624px"
+        height="476px"
+        >
+        <div class="modalHeader" 
+              style="width: 100%;height: 68px;display: flex;align-items: center;justify-content: space-between;background:linear-gradient(0deg,rgba(78, 166, 255, 0) 0%,rgba(78, 166, 255, 0.2000) 100%)"
+            >
+            <div class="headerLeft" style="margin-left: 32px">
+              <span class="headerLeftText" style="font-size: 16px">创建多层项目</span>
+            </div>
+            <div style="cursor: pointer;margin-right:32px" @click="closeModal2">
+              <img
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
+              />
+            </div>
+        </div>
+        <div class="modalMain">
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目名称:</div>
+            <div class="in">
+              <a-input
+                v-model:value="value"
+                show-count :maxlength="30"
+                placeholder="请输入项目名称"
+                style="border-radius: 8px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">分类:</div>
+            <div class="in">
+              <a-select
+                v-model:value="value"
+                placeholder="四个养成"
+                style="border-radius: 8px;height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目经理:</div>
+            <div class="in">
+              <a-input
+                v-model:value="value"
+                placeholder="请选择项目经理"
+                style="border-radius: 8px;height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">资源归属:</div>
+            <div class="in">
+              <a-input
+                v-model:value="value"
+                style="border-radius: 8px;height: 40px"
+              />
+            </div>
+          </div>
+          <div class="pubtn">
+                    <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+                    <a-button class="pubtn2" @click="closeModal2">确定</a-button>
+          </div>
+        </div>
+      </a-modal>
+</div>
+<!-- 学员-创建小组弹窗 -->
 </div>
 </template>
 <script>
@@ -466,8 +579,9 @@ export default {
     setup(){
         const state = reactive({
             visible: false, //时间管理
-      FaceVisivle: true, //面授管理
+            FaceVisivle: false, //面授管理
             pubproject: false,
+            stugroup: false,
             checked: false,
             checked1: true,
             checked2: false,
@@ -480,6 +594,12 @@ export default {
         const closeModal = () => {
             state.pubproject = false;       
         };
+        const showModal2 = () => {
+            state.stugroup = true;
+        };
+        const closeModal2 = () => {
+            state.stugroup = false;       
+        };
         //新增
     const showTime = () => {
       console.log("点击管理");
@@ -494,7 +614,8 @@ export default {
         return {
             ...toRefs(state),
             showModal,
-            closeModal,
+            closeModal,showModal2,
+            closeModal2,
             showTime,
       showFace,
         };
@@ -624,6 +745,88 @@ export default {
     }
   }
 }
+.doublepro {
+  .ant-modal {
+    .ant-modal-body {
+      padding: 0;
+      .modalMain {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .name {
+          width: 78%;
+          // background-color: lightcoral;
+          display: flex;
+          justify-content: right;
+          margin-top: 32px;
+          align-items: center;
+          height: 40px;
+          // border: 1px solid black;
+
+          .inname {
+            color: #000000;
+            font-size: 14px;
+            margin-left: 7px;
+          }
+          .in {
+            margin-left: 14px;
+            width: 81%;
+            .ant-input {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              height: 30px;
+            }
+            .ant-select {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              height: 40px;
+              .ant-select-selector {
+              border-radius: 8px;
+              // height: 120%;
+              width: 100%;
+              height: 40px;
+            }
+            }
+          }
+        
+      }
+      .pubtn {
+            display: flex;
+            justify-content: center;
+            margin-top: 25px;
+            //margin-bottom: 29px;
+            .pubtn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                margin-bottom: 29px;
+                border: 1px solid #409EFF;
+                border-radius: 4px;
+                color: rgba(78, 166, 255, 1);
+                font-size: 14px;
+                //line-height: 36px;
+                align-items: center;
+                background: rgba(255, 255, 255, 1)
+            }
+            .pubtn2 {
+                width: 100px;
+                height: 40px;
+                margin-bottom: 29px;
+                border: 1px solid #409EFF;
+                border-radius: 4px;
+                color: #FFFFFF;
+                font-size: 14px;
+                align-items: center;
+                //line-height: 36px;
+                background: #409EFF;
+            }
+        }
+      }
+    }
+  }
+}
 .taskpage {
     width: 100%;
     display: flex;
@@ -1144,10 +1347,14 @@ export default {
                 align-items: center;
                 margin-left: 32px;
                 .groupname {
+                    height: 22px;
+                    width: 70px;
                     color: #000000;
                     font-size: 14px;
                 }
                 .ant-input {
+                    border-radius: 8px;
+                    width: 264px;
                     height: 40px;
                 }
             }
@@ -1241,10 +1448,100 @@ export default {
                 margin-right: 20px;
                 .grouptitle {
                     display: flex;
-                    justify-content: space-betwwen;
+                    justify-content: space-between;
+                    margin-top: 5px;
                     border-bottom: 1px solid rgba(232, 232, 232, 1);
                     .goodgruop {
-                        
+                        color: rgba(0, 0, 0, 0.8500);
+                        font-size: 16px;
+                        line-height: 36px;
+                        font-weight: 600;
+                    } 
+                    .more {
+                        position: relative;
+                        //margin-right: 30px;
+                        height: 30px;
+                        display: flex;
+                        align-items: center;
+                        .moreItems {
+                        width: 76px;
+                        height: 80px;
+                        display: none;
+                        background: #ffffff;
+                        box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
+                        // border-radius: 3px;
+                        border: 0px solid #dcdcdc;
+                        position: absolute;
+                        left: -48px;
+                        top: 30px;
+                        z-index: 100;
+                        cursor: pointer;
+                        .sammo {
+                            text-align: center;
+                            margin-top: 12px;
+                            cursor: pointer;
+                        }
+                        .sammo:hover {
+                            color: #4ea6ff;
+                        }
+                        }
+                        .moreItems:hover {
+                        display: block;
+                        }
+                    }
+                    @media screen and (max-width: 1240px) {
+                        .line {
+                        margin-right: 10px;
+                        }
+                        .img1 {
+                        margin-right: 15px;
+                        }
+                        .img2 {
+                        margin-right: 10px;
+                        }
+                        .return {
+                        margin-right: 10px;
+                        }
+                        .pub {
+                        margin-right: 10px;
+                        }
+                        .more {
+                        margin-right: 10px;
+                        }
+                    }
+                    .more:hover .moreArrow {
+                        background-image: url("../../assets/images/navtop/up.png");
+                    }
+                    .more:hover .moreItems {
+                        display: block;
+                    }                  
+                }
+                .leader {
+                    color: rgba(0, 0, 0, 1);
+                    font-size: 14px;
+                    margin-top: 16px;
+                    //margin-left: 24px;
+                }
+                .grocenter {
+                    display: flex;
+                    margin-top: 14px;
+                    .leader1 {
+                        color: rgba(0, 0, 0, 1);
+                        font-size: 14px;
+                        width: 51px;
+                    }
+                    .ant-progress-outer {
+                        width: 170px;
+                    }
+                }
+                .grofooter {
+                    display: flex;
+                    justify-content: space-between;
+                    cursor: pointer;
+                    margin-top: 30px;
+                    .ftext {
+                        color: rgba(56, 139, 225, 1);
+                        font-size: 14px;
                     }
                 }
             }

From 13ddba8ef57860c3dcc7673403dfa60a159ba8ea Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 18 Oct 2022 11:36:38 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue          |  14 +-
 .../{EidtOnline.vue => EditOnline.vue}        | 136 +++++++++---------
 src/views/projectcenter/TaskAdd.vue           |   4 +-
 3 files changed, 82 insertions(+), 72 deletions(-)
 rename src/components/drawers/{EidtOnline.vue => EditOnline.vue} (83%)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 0fd2359f..dee80d18 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -24,7 +24,7 @@
                             <div class="fi_input">
                                 <a-input
                                     v-model:value="value1"
-                                    style="width: 270px; height: 40px; border-radius: 8px"
+                                    style="width: 240px; height: 40px; border-radius: 8px"
                                     placeholder="请输入项目名称"
                                 />
                             </div>
@@ -34,7 +34,7 @@
                             <div class="select">
                                 <a-select
                                 dropdownClassName="dropdown-style"
-                                style="width: 200px"
+                                style="width: 240px"
                                 placeholder="请选择"
                                 :options="options1"
                                 allowClear
@@ -283,7 +283,7 @@ import { reactive, toRefs, ref } from "vue";
     },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -307,18 +307,24 @@ import { reactive, toRefs, ref } from "vue";
             .main_items{
                 display: flex;
                 justify-content: space-between;
-                margin-bottom: 32px;
+                margin-bottom: 12px;
+                flex-wrap: wrap;
                 .mi_ipts{
                     display: flex;
+                    margin-bottom: 20px;
                     .mii_ipt{
                         display: flex;
                         align-items: center;
                         margin-right: 24px;
+                        .ipt_name{
+                            white-space: nowrap;
+                        }
                     }
                 }
                 .mi_btns{
                     display: flex;
                     margin-left: 38px;
+                    margin-bottom: 20px;
                     cursor: pointer;
                     .btn {
                         padding: 0px 26px 0px 26px;
diff --git a/src/components/drawers/EidtOnline.vue b/src/components/drawers/EditOnline.vue
similarity index 83%
rename from src/components/drawers/EidtOnline.vue
rename to src/components/drawers/EditOnline.vue
index 6babc1ec..feaec1d1 100644
--- a/src/components/drawers/EidtOnline.vue
+++ b/src/components/drawers/EditOnline.vue
@@ -9,7 +9,7 @@
     >
         <div class="drawerMain">
             <div class="header">
-                <div class="headerTitle">添加在线</div>
+                <div class="headerTitle">编辑在线</div>
                 <img
                     style="width: 29px; height: 29px; cursor: pointer"
                     src="../../assets/images/basicinfo/close.png"
@@ -17,6 +17,29 @@
                 />
             </div>
             <div class="contentMain">
+                <div class="main_item">
+                    <div class="signbox">
+                        <div class="sign"><img src="@/assets/images/coursewareManage/asterisk.png" alt=""></div>
+                        <span style="margin-right: 3px">课程名称：</span>
+                    </div>
+                    <div class="fi_input">
+                        <a-input
+                        v-model:value="value2"
+                        style="width: 384px; height: 40px; border-radius: 8px"
+                        placeholder="请输入小组名称"
+                        />
+                    </div>
+                </div>
+                <div class="main_item">
+                    <div class="signbox">
+                        <div class="sign"><img src="@/assets/images/coursewareManage/asterisk.png" alt=""></div>
+                        <span style="margin-right: 3px">选择课程：</span>
+                    </div>
+                    <div class="btnbox">
+                        <button class="xkbtn">选择课程</button>
+                        <a-tag closable @close="log" color='#F0FFFF' style="background-color: #388BE1;">时间管理</a-tag>
+                    </div>
+                </div>
                 <div class="main_items">
                     <div class="mi_ipts">
                         <div class="mii_ipt">
@@ -24,7 +47,7 @@
                             <div class="fi_input">
                                 <a-input
                                     v-model:value="value1"
-                                    style="width: 270px; height: 40px; border-radius: 8px"
+                                    style="width: 240px; height: 40px; border-radius: 8px"
                                     placeholder="请输入项目名称"
                                 />
                             </div>
@@ -34,7 +57,7 @@
                             <div class="select">
                                 <a-select
                                 dropdownClassName="dropdown-style"
-                                style="width: 200px"
+                                style="width: 240px"
                                 placeholder="请选择"
                                 :options="options1"
                                 allowClear
@@ -54,16 +77,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="main_notice">
-                    <div class="mntc_left">
-                        <div class="notice_icon"></div>
-                        <span style="color:rgba(0, 0, 0, .65); margin-right:17px;">已选择 <span style="color:#388BE1;">4</span> 项</span>
-                        <span style="color:rgba(0, 0, 0, .65)">列表选项总计：<span>14</span> 条</span>
-                    </div>
-                    <div class="mntc_right">
-                        <span style="color:#387DF7; margin-right:24px;">清空</span>
-                    </div>
-                </div>
                 <div class="main_table">
                     <a-table class="ant-table-striped" 
                         :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" 
@@ -172,7 +185,7 @@ import { reactive, toRefs, ref } from "vue";
             default: false,
         },
     },
-    setup(props, ctx) {
+    setup( props,ctx) {
         const state = reactive({
             tableData1: [
                 {
@@ -238,42 +251,20 @@ import { reactive, toRefs, ref } from "vue";
                     creator:'管理员',
                     time:'2022-10-31 23:12:00',
                 },
-                {
-                    key: "8",
-                    num: 'JDF2022071100001',
-                    name:'时间管理课程',
-                    content:'领导力',
-                    teacher:'BOE教师',
-                    creator:'管理员',
-                    time:'2022-10-31 23:12:00',
-                },
-                {
-                    key: "9",
-                    num: 'JDF2022071100001',
-                    name:'时间管理课程',
-                    content:'领导力',
-                    teacher:'BOE教师',
-                    creator:'管理员',
-                    time:'2022-10-31 23:12:00',
-                },
             ],
             currentPage: 1,
             tableDataTotal: 100,
             pageSize: 10,
         });
-        // const closeDrawer = () => {
-        //     ctx.emit("update:addonlineVisible", false);
-        // };
-        // const afterVisibleChange = (bool) => {
-        //     console.log("state", bool);
-        // };
-        // const showDrawerOnline = () => {
-        //     state.visible = true;
-        // };
+        const closeDrawer = () => {
+            ctx.emit("update:editonlineVisible", false);
+        };
+        const afterVisibleChange = (bool) => {
+            console.log("state", bool);
+        };
         return {
             ...toRefs(state),
             afterVisibleChange,
-            showDrawerOnline,
             closeDrawer,
             options1,
             columns1,
@@ -283,7 +274,7 @@ import { reactive, toRefs, ref } from "vue";
     },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -304,21 +295,55 @@ import { reactive, toRefs, ref } from "vue";
             }
         }
         .contentMain {
+            .main_item{
+                display: flex;
+                align-items: center;
+                margin-bottom: 32px;
+                .signbox{
+                    display: flex;
+                    align-items: center;
+                    .sign{
+                        margin-right: 5px;
+                    }
+                }
+                .btnbox{
+                    display: flex;
+                    align-items: center;
+                    .xkbtn {
+                        cursor: pointer;
+                        width: 130px;
+                        height: 40px;
+                        background: #388BE1;
+                        border-radius: 8px;
+                        border: 0;
+                        margin-right: 8px;
+                        color: #fff;
+                    }
+                }
+            }
             .main_items{
                 display: flex;
                 justify-content: space-between;
-                margin-bottom: 32px;
+                flex-wrap:wrap;
+                margin-bottom: 12px;
                 .mi_ipts{
                     display: flex;
+                    margin-bottom: 20px;
+                    flex-wrap: wrap;
                     .mii_ipt{
                         display: flex;
                         align-items: center;
                         margin-right: 24px;
+                        margin-bottom: 10px;
+                        .ipt_name{
+                            white-space: nowrap;
+                        }
                     }
                 }
                 .mi_btns{
                     display: flex;
                     margin-left: 38px;
+                    margin-bottom: 20px;
                     cursor: pointer;
                     .btn {
                         padding: 0px 26px 0px 26px;
@@ -382,29 +407,6 @@ import { reactive, toRefs, ref } from "vue";
                     }
                 }
             }
-            .main_notice{
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                margin-bottom: 32px;
-                height: 40px;
-                background-color: #E9F6FE;
-                .mntc_left{
-                    display: flex;
-                    align-items: center;    
-                    .notice_icon{
-                        width: 14px;
-                        height: 14px;
-                        margin-right: 9px;
-                        margin-left: 9px;
-                        background-image: url(@/assets/images/coursewareManage/gan.png);
-                        background-size: 100% 100%;
-                    }
-                }
-                .mntc_right{
-                    cursor: pointer;
-                }
-            }
             .main_btns{
                 height: 72px;
                 width: 100%;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 855b3f0a..56e22366 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -227,7 +227,7 @@
           </div>
           <!-- 编辑在线侧弹窗 -->
           <div>
-            <add-online  v-model:addonlineVisible="visible" />
+            <edit-online  v-model:editonlineVisible="visible2" />
           </div>
           <!-- 编辑在线侧弹窗 -->
         </div>
@@ -293,6 +293,7 @@
 <script>
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
+import EditOnline from "../../components/drawers/EditOnline.vue";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -335,6 +336,7 @@ export default {
     name: "LevelAddDetail",
     components: {
       AddOnline,
+      EditOnline,
     },
     setup() {
         const state = reactive({

From 2ab784b61a3ddaa54441b69a186d9d6f6aa132f6 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 18 Oct 2022 15:12:03 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat:=E5=88=A0=E9=99=A4=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=20=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=BC=80=E8=AF=BE=E6=9B=B4=E6=94=B9=E4=B8=A4=E4=B8=AA=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue      | 447 +++++++++++++++++++
 src/views/courselibrary/CoursewareManage.vue | 340 +++++---------
 src/views/projectcenter/TaskAdd.vue          |  20 +-
 3 files changed, 579 insertions(+), 228 deletions(-)
 create mode 100644 src/components/drawers/AddFaceteach.vue

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
new file mode 100644
index 00000000..f0353ac9
--- /dev/null
+++ b/src/components/drawers/AddFaceteach.vue
@@ -0,0 +1,447 @@
+<template>
+    <a-drawer
+        :visible="addonlineVisible"
+        class="drawerStyle"
+        width="80%"
+        title="添加在线"
+        placement="right"
+        @after-visible-change="afterVisibleChange"
+    >
+        <div class="drawerMain">
+            <div class="header">
+                <div class="headerTitle">添加在线</div>
+                <img
+                    style="width: 29px; height: 29px; cursor: pointer"
+                    src="../../assets/images/basicinfo/close.png"
+                    @click="closeDrawer"
+                />
+            </div>
+            <div class="contentMain">
+                <div class="main_items">
+                    <div class="mi_ipts">
+                        <div class="mii_ipt">
+                            <div class="ipt_name">课程编号：</div>
+                            <div class="fi_input">
+                                <a-input
+                                    v-model:value="value1"
+                                    style="width: 240px; height: 40px; border-radius: 8px"
+                                    placeholder="请输入项目名称"
+                                />
+                            </div>
+                        </div>
+                        <div class="mii_ipt">
+                            <div class="ipt_name">内容分类：</div>
+                            <div class="select">
+                                <a-select
+                                dropdownClassName="dropdown-style"
+                                style="width: 240px"
+                                placeholder="请选择"
+                                :options="options1"
+                                allowClear
+                                showSearch
+                            />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mi_btns">
+                        <div class="btn btn1">
+                            <div class="search"></div>
+                            <div class="btnText">搜索</div>
+                        </div>
+                        <div class="btn btn2">
+                            <div class="search"></div>
+                            <div class="btnText">重置</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="main_notice">
+                    <div class="mntc_left">
+                        <div class="notice_icon"></div>
+                        <span style="color:rgba(0, 0, 0, .65); margin-right:17px;">已选择 <span style="color:#388BE1;">4</span> 项</span>
+                        <span style="color:rgba(0, 0, 0, .65)">列表选项总计：<span>14</span> 条</span>
+                    </div>
+                    <div class="mntc_right">
+                        <span style="color:#387DF7; margin-right:24px;">清空</span>
+                    </div>
+                </div>
+                <div class="main_table">
+                    <a-table class="ant-table-striped" 
+                        :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" 
+                        :row-selection="rowSelection" 
+                        :columns="columns1" 
+                        :data-source="tableData1"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        :pagination="{
+                            showSizeChanger: true,
+                            showQuickJumper: true,
+                            hideOnSinglePage: true,
+                            pageSizeOptions: [],
+                            pageSize: pageSize,
+                            current: currentPage,
+                            total: tableDataTotal,
+                            onChange: (page, pageSize) => {
+                            currentPage = page;
+                            // console.log('page', page)
+                            // 加翻页查找代码
+                            // 	this.setState({
+                            // 		currentPage: page,
+                            // 	}, () => {
+                            // 		this.getMilitaryDeployment()
+                            // 	})
+                            },
+                        }"
+                    />
+                </div>
+                <div class="main_btns">
+                    <button class="btn1">取消</button>
+                    <button class="btn2">确定</button>
+                </div>
+            </div>
+        </div>
+    </a-drawer>
+</template>
+<script>
+import { reactive, toRefs, ref } from "vue";
+    const options1 = ref([
+            {
+                value: "value1",
+                label: "请选择状态",
+            },
+    ]);
+    const columns1 = [
+        {
+            title: "课程编号",
+            width: '20%',
+            dataIndex: "num",
+            key: "num",
+            align: "center",
+        },
+        {
+            title: "名称",
+            width: '20%',
+            dataIndex: "name",
+            key: "name",
+            align: "center",
+        },
+        {
+            title: "内容分类",
+            width: '13%',
+            dataIndex: "content",
+            key: "content",
+            align: "center",
+        },
+        {
+            title: "授课教师",
+            width: '13%',
+            dataIndex: "teacher",
+            key: "teacher",
+            align: "center",
+        },
+        {
+            title: "创建人",
+            width: '13%',
+            dataIndex: "creator",
+            key: "creator",
+            align: "center",
+        },
+        {
+            title: "完成时间",
+            width: '20%',
+            dataIndex: "time",
+            key: "time",
+            align: "center",
+        },
+    ]
+    const rowSelection = ref({
+        checkStrictly: false,
+        onChange: (selectedRowKeys, selectedRows) => {
+            console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+        },
+        onSelect: (record, selected, selectedRows) => {
+            console.log(record, selected, selectedRows);
+        },
+        onSelectAll: (selected, selectedRows, changeRows) => {
+            console.log(selected, selectedRows, changeRows);
+        },
+    });
+    export default {
+        name: "AddFaceteach",
+        props: {
+        addfaceteachVisible: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    setup(props, ctx) {
+        const state = reactive({
+            tableData1: [
+                {
+                    key: "1",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'通用力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "2",
+                    num: 'JDF2022071100001',
+                    name:'管理能力课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "3",
+                    num: 'JDF2022071100001',
+                    name:'快速换模SMED',
+                    content:'通用力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "4",
+                    num: 'JDF2022071100001',
+                    name:'巧妙对话人见人夸',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "5",
+                    num: 'JDF2022071100001',
+                    name:'管理能力课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "6",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "7",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "8",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+                {
+                    key: "9",
+                    num: 'JDF2022071100001',
+                    name:'时间管理课程',
+                    content:'领导力',
+                    teacher:'BOE教师',
+                    creator:'管理员',
+                    time:'2022-10-31 23:12:00',
+                },
+            ],
+            currentPage: 1,
+            tableDataTotal: 100,
+            pageSize: 10,
+        });
+        const closeDrawer = () => {
+            ctx.emit("update:addfaceteachVisible", false);
+        };
+        const afterVisibleChange = (bool) => {
+            console.log("state", bool);
+        };
+        const showDrawerFaceteach = () => {
+            state.visible3 = true;
+        };
+        return {
+            ...toRefs(state),
+            afterVisibleChange,
+            showDrawerFaceteach,
+            closeDrawer,
+            options1,
+            columns1,
+            rowSelection,
+            // change,
+        };
+    },
+};
+</script>
+<style lang="scss" scoped>
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+.drawerStyle {
+    .drawerMain {
+        .header {
+            height: 73px;
+            border-bottom: 1px solid #e8e8e8;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .headerTitle {
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            line-height: 25px;
+            margin-left: 24px;
+            }
+        }
+        .contentMain {
+            .main_items{
+                display: flex;
+                justify-content: space-between;
+                margin-bottom: 12px;
+                flex-wrap: wrap;
+                .mi_ipts{
+                    display: flex;
+                    margin-bottom: 20px;
+                    .mii_ipt{
+                        display: flex;
+                        align-items: center;
+                        margin-right: 24px;
+                        .ipt_name{
+                            white-space: nowrap;
+                        }
+                    }
+                }
+                .mi_btns{
+                    display: flex;
+                    margin-left: 38px;
+                    margin-bottom: 20px;
+                    cursor: pointer;
+                    .btn {
+                        padding: 0px 26px 0px 26px;
+                        height: 38px;
+                        border-radius: 8px;
+                        border: 1px solid rgba(64, 158, 255, 1);
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        margin-left: 14px;
+                        flex-shrink: 0;
+                        .search {
+                        background-size: 100%;
+                        }
+                        .btnText {
+                        font-size: 14px;
+                        font-weight: 400;
+                        line-height: 36px;
+                        margin-left: 5px;
+                        }
+                    }
+                    .btn1 {
+                        background: rgb(64, 158, 255);
+                        .search {
+                        width: 15px;
+                        height: 17px;
+                        background-image: url("@/assets/images/coursewareManage/search0.png");
+                        }
+                        .btnText{
+                            color: rgb(255, 255, 255);
+                        }
+                    }
+                    .btn2 {
+                        background: rgb(255, 255, 255);
+                        .search {
+                        width: 15px;
+                        height: 17px;
+                        background-image: url("@/assets/images/coursewareManage/reset1.png");
+                        }
+                        .btnText{
+                            color: rgb(64, 158, 255);
+                        }
+                    }
+                    .btn1:hover {
+                        background: rgb(255, 255, 255);
+                        .search {
+                        background-image: url("@/assets/images/courseManage/search1.png");
+                        }
+                        .btnText {
+                        color: #388BE1;
+                        }
+                    }
+                    .btn2:hover {
+                        background: rgba(64, 158, 255, 1);
+                        .search {
+                        background-image: url("@/assets/images/courseManage/reset0.png");
+                        }
+                        .btnText {
+                        color: #ffffff;
+                        }
+                    }
+                }
+            }
+            .main_notice{
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 32px;
+                height: 40px;
+                background-color: #E9F6FE;
+                .mntc_left{
+                    display: flex;
+                    align-items: center;    
+                    .notice_icon{
+                        width: 14px;
+                        height: 14px;
+                        margin-right: 9px;
+                        margin-left: 9px;
+                        background-image: url(@/assets/images/coursewareManage/gan.png);
+                        background-size: 100% 100%;
+                    }
+                }
+                .mntc_right{
+                    cursor: pointer;
+                }
+            }
+            .main_btns{
+                height: 72px;
+                width: 100%;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+                .btn1 {
+                    width: 100px;
+                    height: 40px;
+                    border: 1px solid #4ea6ff;
+                    border-radius: 8px;
+                    color: #4ea6ff;
+                    background-color: #fff;
+                    cursor: pointer;
+                }
+                .btn2 {
+                    cursor: pointer;
+                    width: 100px;
+                    height: 40px;
+                    background: #4ea6ff;
+                    border-radius: 8px;
+                    border: 0;
+                    margin-left: 15px;
+                    color: #fff;
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 569cf566..526f7751 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -567,7 +567,7 @@
       />
     </div>
     <!-- 表格 -->
-    <!-- 操作在线课程管理页面 -->
+    <!-- 操作在线面授课程管理页面 -->
     <a-modal
       v-model:visible="om_1"
       title="Title"
@@ -583,7 +583,8 @@
               style="width: 17px; height: 18px; margin-right: 8px"
               src="../../assets/images/basicinfo/add.png"
             />
-            <span class="headerLeftText">在线课程管理</span>
+            <div :style="{ display: ft_1 ? 'none' : 'block'}"> <span class="headerLeftText">在线课程管理</span> </div>
+            <div :style="{ display: ft_1 ? 'block' : 'none' }"> <span class="headerLeftText">面授课程管理</span> </div>
           </div>
           <div style="margin-right: 57px; cursor: pointer">
             <img
@@ -606,211 +607,107 @@
                       <div class="bs_left">状态：</div>
                       <div class="bs_right">已审核</div>
                     </div>
-                    <div class="b_menu">
-                      <a-menu v-model:selectedKeys="current" mode="horizontal">
-                        <a-menu-item key="mail"> 报名管理 </a-menu-item>
-                        <a-menu-item key="sub2"> 学习记录 </a-menu-item>
-                        <a-menu-item key="sub3"> 资源完成情况 </a-menu-item>
-                      </a-menu>
-                    </div>
-                    <div class="b_menunav">
-                      <div class="bm_select">
-                        <a-select
-                          class="select"
-                          ref="select"
-                          placeholder="请选择状态"
-                          v-model:value="value12"
-                          style="width: 200px"
-                          @focus="focus"
-                          @change="handleChange"
-                        >
-                          <a-select-option value="status">状态</a-select-option>
-                          <a-select-option value="passed">已通过</a-select-option>
-                          <a-select-option value="weishenhe">未审核</a-select-option>
-                          <a-select-option value="reject">管理员拒绝</a-select-option>
-                        </a-select>
-                      </div>
-                      <div class="bm_input">
-                        <a-input
-                          v-model:value="value13"
-                          style="width: 200px; height: 40px; border-radius: 8px"
-                          placeholder="姓名"
-                        />
-                      </div>
-                      <div class="bm_btn">
-                        <div class="btn btn1">
-                          <div class="search"></div>
-                          <div class="btnText">搜索</div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="bm_table" style="margin-bottom: 20px">
-                      <a-table
-                        :columns="columns2"
-                        :data-source="tableData2"
-                        :loading="tableDataTotal === -1 ? true : false"
-                        :pagination="false"
-                      />
-                    </div>
-                  </div>
-                </div>
-          </div>
-        </div>
-    </a-modal>
-    <!-- 操作在线课程管理页面 -->
-    <!-- 操作面授课程管理页面 -->
-    <a-modal
-      v-model:visible="ftm_1"
-      title="Title"
-      @ok="closeModal"
-      :footer="null"
-      :closable="false"
-      wrapClassName="modalStyle"
-      width="80%"
-    >
-        <div class="modalHeader">
-          <div class="headerLeft">
-            <img
-              style="width: 17px; height: 18px; margin-right: 8px"
-              src="../../assets/images/basicinfo/add.png"
-            />
-            <span class="headerLeftText">面授课程管理</span>
-          </div>
-          <div style="margin-right: 57px; cursor: pointer">
-            <img
-              @click="ftm_exit"
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="faceteachmanage" :style="{ display: ftm_1 ? 'block' : 'none' }">
-            <div class="om_main">
-              <div class="om_body">
-                <div class="b_title">课程：BMOT2021年职级晋升-安全管理（高级）</div>
-                <div class="b_sub">
-                  <div class="bs_type">类型：</div>
-                  <div class="bs_right">录播课</div>
-                  <div class="bs_left">内容分类：</div>
-                  <div class="bs_right">领导力</div>
-                  <div class="bs_left">状态：</div>
-                  <div class="bs_right">已审核</div>
-                </div>
-                <a-tabs
-                    class="b_menu"
-                    v-model:activeKey="activeKey"
-                    size="large"
-                    :tabBarStyle="{ marginLeft: '10px' }"
-                >
-                  <a-tab-pane key="1" tab="报名管理">
-                      1
-                  </a-tab-pane>
-                  <a-tab-pane key="2" tab="学习记录">
-                    <div class="b_menunav">
-                      <div class="bm_select">
-                        <a-select
-                          class="select"
-                          ref="select"
-                          placeholder="请选择状态"
-                          v-model:value="value14"
-                          style="width: 200px"
-                          @focus="focus"
-                          @change="handleChange"
-                        >
-                          <a-select-option value="status">状态</a-select-option>
-                          <a-select-option value="passed">已通过</a-select-option>
-                          <a-select-option value="weishenhe">未审核</a-select-option>
-                          <a-select-option value="reject">管理员拒绝</a-select-option>
-                        </a-select>
-                      </div>
-                      <div class="bm_input">
-                        <a-input
-                          v-model:value="value15"
-                          style="width: 200px; height: 40px; border-radius: 8px"
-                          placeholder="姓名"
-                        />
-                      </div>
-                      <div class="bm_btn">
-                        <div class="btn btn1">
-                          <div class="search"></div>
-                          <div class="btnText">搜索</div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="bm_table" style="margin-bottom: 20px">
-                      <a-table
-                        :columns="columns2"
-                        :data-source="tableData3"
-                        :loading="tableDataTotal === -1 ? true : false"
-                        :pagination="false"
-                      >
-                        <template #bodyCell="{ column }">
-                          <template v-if="column.key === 'opacation'">
-                            <a @click="ckxq_hs">查看详情</a>
-                          </template>
-                        </template>
-                      </a-table>
-                    </div>
-                  </a-tab-pane>
-                </a-tabs>
-                <!-- <div class="b_menu">
-                  <a-menu v-model:selectedKeys="current" mode="horizontal">
-                    <a-menu-item key="mail"> 报名管理 </a-menu-item>
-                    <a-menu-item key="sub2"> 学习记录 </a-menu-item>
-                  </a-menu>
-                </div> -->
-                <!-- <div class="b_menunav">
-                  <div class="bm_select">
-                    <a-select
-                      class="select"
-                      ref="select"
-                      placeholder="请选择状态"
-                      v-model:value="value14"
-                      style="width: 200px"
-                      @focus="focus"
-                      @change="handleChange"
+                    <a-tabs
+                        class="b_menu"
+                        v-model:activeKey="activeKey"
+                        size="large"
+                        :tabBarStyle="{ marginLeft: '10px' }"
                     >
-                      <a-select-option value="status">状态</a-select-option>
-                      <a-select-option value="passed">已通过</a-select-option>
-                      <a-select-option value="weishenhe">未审核</a-select-option>
-                      <a-select-option value="reject">管理员拒绝</a-select-option>
-                    </a-select>
-                  </div>
-                  <div class="bm_input">
-                    <a-input
-                      v-model:value="value15"
-                      style="width: 200px; height: 40px; border-radius: 8px"
-                      placeholder="姓名"
-                    />
-                  </div>
-                  <div class="bm_btn">
-                    <div class="btn btn1">
-                      <div class="search"></div>
-                      <div class="btnText">搜索</div>
-                    </div>
+                      <a-tab-pane key="1" tab="报名管理">
+                        <div class="b_menunav">
+                          <div class="bm_select">
+                            <a-select
+                              class="select"
+                              ref="select"
+                              placeholder="请选择状态"
+                              v-model:value="value12"
+                              style="width: 200px"
+                              @focus="focus"
+                              @change="handleChange"
+                            >
+                              <a-select-option value="status">状态</a-select-option>
+                              <a-select-option value="passed">已通过</a-select-option>
+                              <a-select-option value="weishenhe">未审核</a-select-option>
+                              <a-select-option value="reject">管理员拒绝</a-select-option>
+                            </a-select>
+                          </div>
+                          <div class="bm_input">
+                            <a-input
+                              v-model:value="value13"
+                              style="width: 200px; height: 40px; border-radius: 8px"
+                              placeholder="姓名"
+                            />
+                          </div>
+                          <div class="bm_btn">
+                            <div class="btn btn1">
+                              <div class="search"></div>
+                              <div class="btnText">搜索</div>
+                            </div>
+                          </div>
+                        </div>
+                        <div class="bm_table" style="margin-bottom: 20px">
+                          <a-table
+                            :columns="columns2"
+                            :data-source="tableData2"
+                            :loading="tableDataTotal === -1 ? true : false"
+                            :pagination="false"
+                          />
+                        </div>
+                      </a-tab-pane>
+                      <a-tab-pane key="2" tab="学习记录">
+                        <div class="b_menunav">
+                          <div class="bm_select">
+                            <a-select
+                              class="select"
+                              ref="select"
+                              placeholder="请选择状态"
+                              v-model:value="value14"
+                              style="width: 200px"
+                              @focus="focus"
+                              @change="handleChange"
+                            >
+                              <a-select-option value="status">状态</a-select-option>
+                              <a-select-option value="passed">已通过</a-select-option>
+                              <a-select-option value="weishenhe">未审核</a-select-option>
+                              <a-select-option value="reject">管理员拒绝</a-select-option>
+                            </a-select>
+                          </div>
+                          <div class="bm_input">
+                            <a-input
+                              v-model:value="value15"
+                              style="width: 200px; height: 40px; border-radius: 8px"
+                              placeholder="姓名"
+                            />
+                          </div>
+                          <div class="bm_btn">
+                            <div class="btn btn1">
+                              <div class="search"></div>
+                              <div class="btnText">搜索</div>
+                            </div>
+                          </div>
+                        </div>
+                        <div class="bm_table" style="margin-bottom: 20px">
+                          <a-table
+                            :columns="columns2"
+                            :data-source="tableData3"
+                            :loading="tableDataTotal === -1 ? true : false"
+                            :pagination="false"
+                          >
+                            <template #bodyCell="{ column }">
+                              <template v-if="column.key === 'opacation'">
+                                <a @click="ckxq_hs">查看详情</a>
+                              </template>
+                            </template>
+                          </a-table>
+                        </div>
+                      </a-tab-pane>
+                    </a-tabs>
                   </div>
                 </div>
-                <div class="bm_table" style="margin-bottom: 20px">
-                  <a-table
-                    :columns="columns2"
-                    :data-source="tableData3"
-                    :loading="tableDataTotal === -1 ? true : false"
-                    :pagination="false"
-                  >
-                    <template #bodyCell="{ column }">
-                      <template v-if="column.key === 'opacation'">
-                        <a @click="ckxq_hs">查看详情</a>
-                      </template>
-                    </template>
-                  </a-table>
-                </div> -->
-              </div>
-            </div>
           </div>
         </div>
     </a-modal>
-    <!-- 操作面授课程管理页面 -->
+    <!-- 操作在线面授课程管理页面 -->
     <!-- 面授课程管理查看详情页面 -->
     <a-modal
       v-model:visible="om_ckxq"
@@ -1142,12 +1039,10 @@
                 <span style="margin-right: 3px">签到设置</span>
               </div>
               <div class="b_input">
-                <a-checkbox v-model:checked="checked">
-                  <span style="color: #6d7584; margin-right: 30px">是否允许未报名的学员签到</span>
-                </a-checkbox>
-                <a-checkbox v-model:checked="checked">
-                  <span style="color: #6d7584">签到是否需要口令</span>
-                </a-checkbox>
+                <a-radio-group v-model:value="valueB">
+                  <a-radio :value="24"><span style="color: #6d7584; margin-right: 30px">是否允许未报名的学员签到</span></a-radio>
+                  <a-radio :value="25"><span style="color: #6d7584">签到是否需要口令</span></a-radio>
+                </a-radio-group>
               </div>
           </div>
           <div class="cstm_items">
@@ -1165,15 +1060,11 @@
                 <span style="margin-right: 3px">完成规则</span>
               </div>
               <div class="b_input">
-                <a-checkbox v-model:checked="checked">
-                  <span style="color: #6d7584; margin-right: 30px">报名即完成</span>
-                </a-checkbox>
-                <a-checkbox v-model:checked="checked">
-                  <span style="color: #6d7584; margin-right: 30px">签到即完成</span>
-                </a-checkbox>
-                <a-checkbox v-model:checked="checked">
-                  <span style="color: #6d7584">请假算完成</span>
-                </a-checkbox>
+                <a-radio-group v-model:value="valueC">
+                  <a-radio :value="26"><span style="color: #6d7584; margin-right: 30px">报名即完成</span></a-radio>
+                  <a-radio :value="27"><span style="color: #6d7584; margin-right: 30px">签到即完成</span></a-radio>
+                  <a-radio :value="28"><span style="color: #6d7584">请假算完成</span></a-radio>
+                </a-radio-group>
               </div>
           </div>
           <div class="cstm_items items_fj">
@@ -2186,7 +2077,7 @@ export default defineComponent({
       bs_hs: true,
       ft_hs:false,
       om_1: false,
-      ftm_1: false,
+      ft_1: false,
       om_ckxq: false,
       gpm_hs: false,
       stm_hs: false,
@@ -2204,6 +2095,8 @@ export default defineComponent({
       value5:"",
       value6:"",
       valueE:"",
+      valueB:"",
+      valueC:"",
       selectedRowKeys: [],
     });
     const fileList = ref([]);
@@ -2264,10 +2157,12 @@ export default defineComponent({
                         class="jc"
                         style={{ width: "30px" }}
                         onClick={() => {
-                          if (value.courseform === "线上") {
+                          if (value.courseform === "线上" ) {
                             state.om_1 = true;
+                            state.ft_1 = false;
                           } else if (value.courseform === "面授") {
-                            state.ftm_1 = true;
+                            state.om_1 = true;
+                            state.ft_1 = true;
                           }
                         }}
                       >
@@ -2766,9 +2661,6 @@ export default defineComponent({
     const om_exit = () => {
       state.om_1 = false;
     };
-    const ftm_exit = () => {
-      state.ftm_1 = false;
-    };
     const ckxq_hs = () => {
       state.om_ckxq = true;
     };
@@ -2840,7 +2732,6 @@ export default defineComponent({
       createft,
       ft_exit,
       om_exit,
-      ftm_exit,
       ckxq_hs,
       ftsr_exit,
       gpm_exit,
@@ -3934,8 +3825,7 @@ export default defineComponent({
         }
       }
       .modalMain{
-        .onlinemanage,
-        .faceteachmanage {
+        .onlinemanage {
           display: none;
           z-index: 999;
           min-width: 1000px;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 56e22366..01c9e58c 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -76,12 +76,17 @@
           <div class="lin"></div>
         </div>
         <div class="item">
-          <div class="itcon">
+          <div class="itcon" @click="showDrawerFaceteach">
             <div class="img">
               <img src="../../assets/images/leveladd/mian.png" />
             </div>
             <div class="text">面授</div>
           </div>
+          <!-- 添加面授侧弹窗 -->
+          <div>
+            <add-faceteach  v-model:addfaceteachVisible="visible3" />
+          </div>
+          <!-- 添加面授侧弹窗 -->
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -294,6 +299,7 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import EditOnline from "../../components/drawers/EditOnline.vue";
+import AddFaceteach from "../../components/drawers/AddFaceteach.vue"
 const drawercolumns = [
   {
     title: "项目名称",
@@ -337,6 +343,7 @@ export default {
     components: {
       AddOnline,
       EditOnline,
+      AddFaceteach,
     },
     setup() {
         const state = reactive({
@@ -582,7 +589,8 @@ export default {
             tableDataTotal: 100,
             pageSize: 10,
             visible: false,
-            visible2:false,
+            visible2: false,
+            visible3: false,
             stage: false,
             selectedRowKeys: [],
         });
@@ -722,7 +730,12 @@ export default {
                 "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
         });
         const showDrawerOnline = () => {
-            state.visible = true;
+          state.visible = true;
+            
+        };
+        const showDrawerFaceteach = () => {
+          state.visible3 = true;
+            console.log(state.visible3);
         };
         return {
             ...toRefs(state),
@@ -736,6 +749,7 @@ export default {
             drawercolumns,
             onSelectChange,
             showDrawerOnline,
+            showDrawerFaceteach,
         };
     },
 };

From 4a6348c9fb89ec69f423d95b96a971d2bd3bda6e Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 18 Oct 2022 16:10:55 +0800
Subject: [PATCH 09/10] =?UTF-8?q?feat:=E7=A1=AE=E5=AE=9A=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue      |  2 +-
 src/views/courselibrary/CoursewareManage.vue | 35 ++++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index f0353ac9..f5d872d8 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -1,6 +1,6 @@
 <template>
     <a-drawer
-        :visible="addonlineVisible"
+        :visible="addfaceteachVisible"
         class="drawerStyle"
         width="80%"
         title="添加在线"
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 526f7751..acdb9240 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -104,7 +104,6 @@
                 />
                 <div class="inp_num"><span style="color:#C7CBD2">{{ value5.length }}/20</span></div>
               </div>
-              <!-- <div class="showcount">{{ valueE.length }}/20</div> -->
             </div>
             <div class="b_sub">
               <div class="bs_header">
@@ -258,8 +257,8 @@
                           maxlength="90"
                           style="width: 440px; height: 40px; border-radius: 8px"
                           placeholder="请输入课程名称"
-                        >
-                        </a-input>
+                        />
+                        <div class="inp_num"><span style="color:#C7CBD2">{{ value6.length }}/90</span></div>
                       </div>
                     </div>
                   </div>
@@ -342,6 +341,7 @@
                           style="width: 440px; height: 40px; border-radius: 8px"
                           placeholder="请输入目标人群"
                         />
+                        <div class="inp_num"><span style="color:#C7CBD2">{{ value7.length }}/50</span></div>
                       </div>
                     </div>
                   </div>
@@ -357,6 +357,7 @@
                           style="width: 440px; height: 40px; border-radius: 8px"
                           placeholder="请输入课程价值"
                         />
+                        <div class="inp_num"><span style="color:#C7CBD2">{{ value8.length }}/200</span></div>
                       </div>
                     </div>
                   </div>
@@ -441,6 +442,7 @@
                           style="width: 440px; height: 100px; border-radius: 8px"
                           placeholder="请输入"
                         />
+                        <div class="inp_num"><span style="color:#C7CBD2">{{ value11.length }}/150</span></div>
                       </div>
                     </div>
                     
@@ -992,9 +994,11 @@
             <div class="b_input">
               <a-input
                 v-model:value="value20"
+                maxlength="50"
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入详细地点"
               />
+              <div class="inp_num"><span style="color:#C7CBD2">{{ value20.length }}/50</span></div>
             </div>
           </div>
           <div class="cstm_items">
@@ -2094,6 +2098,10 @@ export default defineComponent({
       // value2:"",
       value5:"",
       value6:"",
+      value7:"",
+      value8:"",
+      value11:"",
+      value20:"",
       valueE:"",
       valueB:"",
       valueC:"",
@@ -2937,6 +2945,7 @@ export default defineComponent({
       }
       .m_body {
         display: flex;
+        flex-wrap: wrap;
         .mb_left {
           width: 50%;
           .mbl_items {
@@ -2949,6 +2958,7 @@ export default defineComponent({
               display: flex;
               align-items: center;
               justify-content: flex-end;
+              white-space: nowrap;
               .asterisk_icon{
                 width: 10px;
                 height: 10px;
@@ -2958,6 +2968,12 @@ export default defineComponent({
             }
             .item_inp{
               flex:1;
+              position: relative;
+              .inp_num{
+                position: absolute;
+                left:398px;
+                top:10px;
+              }
             }
           }
             .i2_cz{
@@ -2987,6 +3003,7 @@ export default defineComponent({
               display: flex;
               align-items: center;
               justify-content: flex-end;
+              white-space: nowrap;
               .asterisk_icon{
                 width: 10px;
                 height: 10px;
@@ -2996,6 +3013,12 @@ export default defineComponent({
             }
             .item_inp{
               flex:1;
+              position: relative;
+              .inp_num{
+                position: absolute;
+                left:395px;
+                bottom:10px;
+              }
             }
             .accessory{
               display:flex;
@@ -3359,6 +3382,7 @@ export default defineComponent({
         }
         .b_input{
           flex:1;
+          position: relative;
           .upload_box {
             display: flex;
             cursor: pointer;
@@ -3368,6 +3392,11 @@ export default defineComponent({
               margin-right: 5px;
             }
           }
+          .inp_num{
+            position: absolute;
+            top:9px;
+            right:10px;
+          }
         }
       }
       .items_fj{

From de96a19a9b942413f0d9e6c55532d788692da9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 18 Oct 2022 16:14:04 +0800
Subject: [PATCH 10/10] =?UTF-8?q?feat:=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/courseManage/reset2.png | Bin 0 -> 657 bytes
 src/assets/images/taskpage/people1.png    | Bin 0 -> 1208 bytes
 src/assets/images/taskpage/people2.png    | Bin 0 -> 1244 bytes
 src/assets/images/taskpage/people3.png    | Bin 0 -> 1313 bytes
 src/assets/images/taskpage/people4.png    | Bin 0 -> 1236 bytes
 src/views/projectcenter/TaskPage.vue      | 496 +++++++++++++++++++---
 6 files changed, 430 insertions(+), 66 deletions(-)
 create mode 100644 src/assets/images/courseManage/reset2.png
 create mode 100644 src/assets/images/taskpage/people1.png
 create mode 100644 src/assets/images/taskpage/people2.png
 create mode 100644 src/assets/images/taskpage/people3.png
 create mode 100644 src/assets/images/taskpage/people4.png

diff --git a/src/assets/images/courseManage/reset2.png b/src/assets/images/courseManage/reset2.png
new file mode 100644
index 0000000000000000000000000000000000000000..00cb101c7a4fe70f009fb3976e59ca1dc5b43c18
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%OG!jQR5(wqlg&#MaTv!x&#XH;Vj!i7U8+NNNdEv25d{TdZ#SWJT(X??P+>tx
zb=p%#7FhP?u7_l2J!V?;2Ut`@*NBSfl?V^LNal=7^Th08iHaMnzw2*)pZR{j&+`>l
z_{a+LC<~ZUH9qD1cLs7bZO1Nz;>rSs04L}5qjZCw&DfQ_1)!7lx-pFPMf*YcpGiZE
ziNSdE@xn-)oVOFCSyXDmJC#6CNr0{vj6+4B>pcWE{(Y>}BE$q4p9#!(HX+l=k*Qi$
zYZMK(f=mngb?$qGTA&iNsBq!gp3;hjhP;jHHQ;{6Hd{Mg|AD|3F)9wH4@Sli(eT}o
zthd_`Mu8_%9ow^PhK@VyK#)ech;Yg<*gqJz?#>tBxZY>rr5AkPn@!YDFAGc#YLqJf
zgF-zb&ogbYrbU?!dz-DbvG)Tl;{Vr_9oIhxdIsf0rro++YHv%fP15yy6+NwRa>%y&
z%L0a$waWj9NFAy#GPc#Y$nuEanD@;$w>rctX*rpl?NUQ;p!9+Epd84wTjL9c@&$Mm
z{V~;Y{b=3KB`t@_f>rs1XfU8~Z^*V<9oL%xX)=V)b+64ksg#5bplc+*D+qp%0nb8c
z0hrABk5u*FVnf&h6J%7XO*_3$ekF#dYRrgvTVNY71ALpObPZq$a=r-6ddCzt6fzJ|
z6`hP=Ox$cUpDxTSnal4`4Vs0y>LI9hgw;cgM9C?anyTY^SAgScM0$qe(Y~^Pg^F(S
r-wO1nZR=9WDVI{W)O}eBmjeC){vX}|)b;Wv00000NkvXXu0mjfJU26}

literal 0
HcmV?d00001

diff --git a/src/assets/images/taskpage/people1.png b/src/assets/images/taskpage/people1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c16eec4b2c858ff6fcb7dfc52d7ffa264191ade7
GIT binary patch
literal 1208
zcmV;p1V{UcP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px(a!Eu%R7gvmm0N67RTPH5b*?jQr#OHDwv+;bR4!g<fkX&K;)4o;0W?M~#Y?PF
zgAojg@xd5_K4}mUP$CADpoY{Ed@wN(3C09lL23YtTHBIRE*)uUJJUIPpKZ?ABE@RZ
z^Lp0)_rKS_{(lMA_!(oYs8mG4YdIqSRAh{a0}lfWf$6}=zS=gR4yXY>5s~y@7=r>E
zW0nK!dwxAt9M&Ht)7(f`S0_OTVPS&2lCdNw-$ubr6Hfy#iO9~Y!3O{vV;o>(Hq~C$
z`ehB>Esc1gA*mFWfnE`MLqkR@LSx7qKY>y6m*5W@z6E$rL{$F;R|9WOw=`CzYIdWt
z0fA+qqY7gf5@_;OfWnYA2Bj2Agdi59Xz5A{O2=;zk*EI#96ev9&hKd5xrwaSh~r@_
zn^69`+tVQl6%bQd0)%WB(jA7RJ%@3tRuda`!;1d4<WBVo)zJR&#^T^i6QS$T>v&{s
zn*a-ANi+@E20WlZYldWd5fzZunhvcoH;$on<?5*C6C*+Ufh&6(Pi$}B^)||}z;nTM
zQI>-iJJ${+U@QyQvhc8oYePX05bw<p1d8sgBJt?6_~Rz65|I!4fvbDI+Px@y{M#Hm
z+cp?iFusuKRqXxZD52*vZ{DrAj*n|BJR`UoJf&~~9m#+-WhU-DOFtKp2m66r!s-ph
zrY8lqfMc+H4GD+T$&+l|cz_?%HmjE0MIxD`Y+Nz<z7IwaZ7^DcHjo&Kv*3x-A~IU~
z9F+<7ZF8+KnwF@aAbA2qhtqbjnh!SDaIjtIG8Pq6%UD~rj1h%-hz>DgFrgvDAhv~n
z-{S!gyA0g9cbhAr#){q`g6|uGOb7e7Z)M-nbJV9jZl6(3QL>QA1$UE-J4p0?Os);u
zgoy1Bpa0~az<pEE+_-D&Xu3PG9UHN1Yzyj7o}hZqUVctpqFMRG^7Bb13wdPTo!nb7
z4F`>22qQ<D5HE2ZBNtV+h)Bt0@jlw}-lD??4`EwY&Q%eU=F=@S{B)dbHcLhslny9J
zBq%8v!{YlNpdix2sGNZaH8)S6&ddc12Z&c$S6jFJ#Wib*c@DPYW4j(Y$Wni#j_!01
z5iMJUczywn<4`_hHt~2I+mgr!ku<Dbw}wfRZy7LdQIa)OJ@riS566z-xh{_D;rlMX
zoNA!`!UeQe#C(skvZ*AJL(!3~15KcGj`6f<Q+VsmHwGG{ug}YynwobkTk#k@=^kv`
z$pM{hYvug8^H`QeJmxcD(i9xe%Z*w#P$;d4$2>lG|6N8G7Y(#@e{dLMHrIZCr0V$>
z*3s2<3D<SFaITG1>S7Mqb8W646(f-tMW}tcyDyRFdu)1V0~HnJgNINb>s)O9*3?|}
z@++@$_`6yz{+^<vqZ2EV9>I+p@)8#L{%|Vpn8oYsUt{dp(tnT5E12hk{?Ipvia-5q
z5Bm>%O>65J#6VGL5p!nG;-SS$nLB6hwFUi^Ti~kIR1S>j`+pXw{a>qTupRbam+2o1
WpA<8S;e~tv0000<MNUMnLSTYEK`KK4

literal 0
HcmV?d00001

diff --git a/src/assets/images/taskpage/people2.png b/src/assets/images/taskpage/people2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5796dc0fb8ae8b02ed157ea2a948958dbffc543
GIT binary patch
literal 1244
zcmV<21S9*2P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px(mPtfGR7gvmm3vH;WgN#p&wFkhE-DBdIUde|CQt;7i{SvxE@n%cqPb}qPM2=D
ziJMdZK+Nexqq3IOhKnr~%`!L9%!Rg=TQR)hWo~V0P6<O1P{G5wyyrdd)6VI@gs551
z_Wt!g&*%9*-``E}m`h5jgtiJH^v5|O{%Mnx(h4jD<^n~)gvj1IKpSurI4Fehj>Z@j
zETyafwzssLb~Jx?k_&B@>F#-e!DztcbW->3CS0!6kosG|1|h`0k?>()DWwtk<i?Hm
z%D1aGLho%1GKi|_n4@Fp_G)zA^Dt}HOt#k6gusK}E}%*Xp$%Rz5?p`wY+Gf`+O?E8
z6DgljO3I{6&i&lNZ`W@UH$H*x0hQKkz3l&b4{>p^VNT?NT|$VJe*=e}-`RP)alyPr
zJeQHo>}e&WOo$IZKPJUV^RW|j_x6(RwBreA%wADNTtd>20}=R=L0iI#BZ0cw)^^cR
zyP=xw#Ar%NODUUPhGH<Vx1kY|9sJUMhlz@h>65caOwS~9>dPofI9b9=QIwG9nW2CV
zf|p7ucS|X0K75GxYU{|$$tKfoBh_K!q;Qdz>B4uu6=Q!F<MEJ}pF@6m1!hasNY%@P
z5PJr}O{%Jv8;wRf+i$XX^=7h`t-|VkfH?UjiYt${pH2~LP$+-CfVQ*ed3AabQx`91
zOj63QgisXah!A4lAh^Tp^*T%@Gky1ZSyfey@!5s6pZJ2Qb_?s)RMPxoE8~)r$gz!O
z<(kbbm{CmGocT;Do;DJEO9+uFA{FHe1T<4Hs9`pnIkvx%`p*x79^}LI%ZYdEM8%I|
zZ1K~y9{-k2I~sVQ=qd8@bD8m06&7o#mWF%|08v9=UDr(>kC*6ZE2>{*&yIIE+;p5p
z^Iu_ZP62UgPShxkmZRVB*^yIZKViq=uwxw)&$QPT;mpVkr=6lGe}N-e@w=|;sa~%S
zi^Yu8!R>bQ(Z*^nUA#=mltQwzGRT=2htK0-+pdG;Wu~D^1yvW^y+1&4SuwNUTtcGF
z)**y&4h2uw^>R%M5(sF7ybh`U^~wddu3yK4J~zQYklYLx5B(}PyLy;Ynon0xAHIO(
zk9++nCNmYwms0-5>%)RKly3d~1H?qf;#Yk%9oS35&QH;$jtmCzYLc!2KduQ$6sFmb
z0dT7-iY1C(zs8oj?GzLh3`@6=`&V^ccevdi42qG4`j0t&xQXuWZiF7hVl*QZL60|p
zU(<Qgo<w?b68=DdfKYJd<g)#P_lFlq#ODerWuvBP?AzVIp#xvxe(1(C;NgDXLlVct
zAhjT465{a%f`E=aK7nyDR;0zsmYqA9=x_`#>A_TyQr4@gzjF1;6<oh|9goL@-{WIo
zz=u&ttR@qtm}pEEOIUr-r;={Bv!SkztlZqun@~h`xNY9*=&0OQyM-$kFQNMUs9FF;
z3leLM#*f5kG=%NSFDztzO%16|=fAhjN0f&f{h8CJ9jAWyo^xl;(A{-6+>nxN$rKh%
z=Eaw0^30SekJsoQt<4dmX)<7o{O<zJ|F6+B+6?=z!}L#?^8zz>WjPuE0000<MNUMn
GLSTZ!8*EPi

literal 0
HcmV?d00001

diff --git a/src/assets/images/taskpage/people3.png b/src/assets/images/taskpage/people3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5edec63d63bb85b627abb6f06ad3a7ce5f841af6
GIT binary patch
literal 1313
zcmV++1>X9JP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px(+et)0R7gvmm1%5LRTRg6_syGm(^+2Ip{1o8l(G~;p;$o{u|@(0HOL|wf*6db
zRfG>JCP0kD#Es<xF{FgVLO=m!7fb||B3cZaP)aLZprz|{nQ5WZ>8$UWsV$*c4SI9G
z-Sd9;ymRjP{{;`YbX}Jsp+X4lK|T@x6r}5V6z~G@ERX{v_QpDaOTba!YavAUK#T#w
zx~?w;J}xUMO6eqy<b)vzAyIs@j!thkR-1+Kab2XP=hOphg%G>%hxY^Px-J8shr4d&
z`O4OD{HLF(P}ehc@^l=kjriCYsv26jaQPf#z3(zLYaG_`TQSFs*aoZ=LWKG*xF4L~
z+4x)Dor|wxHQwQRO$P^EYj`ww4!%H$L`MuG(~>AEI>;n_J$_G!2B%E+b31Viov}>_
z@y6f4k>BrbuijO>cPeqQ60y-XYU<q_ZeC92#98PD1*5Fsh_>Ua+)jGvD4}2%&Q=M5
z&WzW8#p=j-sjn<O8TU4-qG;!$l*ZEUNJ_Oaa(DtAUK3ji(-<*j2^Ncj-4cxmH8I+|
z0bgq=U48{kH{kU-Fb~dVPTqk?%|}HV+6P|NcC&Ct`SB&(sMTq6cQJEXm=l*{af(TF
zrq3otwUb~oF)RKcx2w<5>};f=#YmLRLX>qdH)=Xquxbw(<8xmYLhS4VAFevJc3#Qp
zJ+yl?&RpptXN=CF3n~*QkES+mCTW8PkrUs<W9qkDE3T!XAwaV$gf-TVRgtJ|lgOO1
zm?bMdJtBmd-v_SyaqFy<pr@JYx(>cNtzncj0?1_NjA8DRX}E(1CaC53UDvo$D$(Xv
z2x}qk1QhC>Ix&_2Ax9SZyHC^$AyP%}MEMF<k2A*DG<2a+TH&Jgwno-y6S5_l$0pRF
zX)3MmHm?8Sr{q>NCIO|53cj$68YSUSyy#|?f@5Vtz<d|{_M&X#@VE|AlXO~L9?n-7
zd3>4`Q~Y$|Q$}&7@ET@cDOJ^Nv~|kFn8TDi6+*fJv)MpyrjPPgm3`lr`~~iP6}9ib
zHaoT3T~2IN6fJHKiW(+4RVDtB)u?JF1s}eJ8tcH>R!6tb4|-%vc!M%l1>)^tB-=2)
zIbK*Ngh;#FyzQIcn|JoqmjrYp;d+^9BxK1<eD)KBgRQuH&BP@nQ&&+*nX`$IrlBJv
z%aJ$(GC`i2|2%6x=-<3$#lIKr*z(b8qLVT(#0;akU8A$UnxM0Wu&0GF4`mVX`te=9
zi9Z~|BMUqRLC9hv%4VZW3$khRRwhrG((k!Nl&m6u?~#;CH=DTa4G`8eY!)-3(?!*x
z?IaF~Bk1WyS7MOu4uW1Uc15Ps<Hll(V(6r4Z2W9P{{iW(^V0ej*RB;Czlf+Vs@;lW
zGU2VfO3TRu7|aSrUx37g%Q2>;_mm<c&=x63sJ(%8tKK9rA+i5R_X&rt>-kqJZ{>Zm
z`zV1>7?a6}zp0jvllxJF8g`7BUs;I<0|rS#k_;FXnbnJ*CNnj0U=ixgx<@wanq7ID
z_8p_Dz6IZHH;sjd(1jU`I+!tY7vR3*A>i|qJ$e}LEPjThxY&P}&3iKM5&H9GRVhFG
za+ad~1+=?62%8;DT=*g*k`l<Bkjdn+84o7(_qxD+*7Put(0kqtT>M|wG?0h=S2O(+
Xv=%Be84ARF00000NkvXXu0mjf{C{wX

literal 0
HcmV?d00001

diff --git a/src/assets/images/taskpage/people4.png b/src/assets/images/taskpage/people4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7504ad57806a823a0bee06a7f378b2ffc0723cd
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px(j!8s8R7gvmm04_5RT#&A=gysd=`t<TWm?)=P)ciM(ZGWXFC-`tki;#)fHARX
zG%-dVH27jPn3$Mo0>nfxC=m=s3AlhSh#-r?14sgu66nmd(@v)|)0x}Z?!Cv%bV?{z
zgPxn4+~j`ecmC&m=lg$xI~-C<r4%ZJFz;lF_@^K#r4x7xSOY8p8Y;0-;2dxe*e`_0
z&c>J(ET!B4yjLjZgT-QwqF%r>b+mLAZ9=2IF@V?O!)9}Yfj5N^pWhCj0hUs#z{iGB
z?8|5=bfbWj5|9|hBFFZB#~&vyU{w3rvh772PB%7tHHu>03A`eN(5Dx;9lS%=^L-gD
zj+7=sKsi82vWam*r%sW+9^-g_jF-1=q^7A6MNtrz8iZooDTLVkH*jhD($x1zBR&N~
zPCX^T0%D;E`#$)Bu3!yny_dz0ETyWgvl0oyQjbuq&rKgonNdkpe?B`Bl(K+=EODnM
zmB<1TBV&B};XXRs0`zvz#qP1v)N?P0(q)kdivydhv2^D1O9`C@Z!8qDyC){1h_b}W
zD1Vxm71?J_UgXPNKd^pf7Yn-EakjQ2R12ml%Wt5e4UfmWNeJ=TH29lHG_p3CN?;l$
zx^AGCf(@grSV}=AGfCv~pPV~(p21O#XV%@1z1B}#cPBQxy|gt(!{e-2x#C+P#JXv4
zXz%t<g1Vl^Kc|jBYcn>N3yaN)p&MMebdA$TPvcZ24Rvk?`XgMto}{BQ$oh55No4Yb
zZVVBRPxAiucfvx57E!6F+?GwRS|`(Kd_Fg6tw>$91JmZf?sSoej-ePutR6RuyIYWk
z$*Hpg7(&oL5W}=s>FsV|)nm(e`0+JGz;P4&_U6~DcB_gM5DAT=Dkd(U2TjW(5SS9~
z>TIHGUK6Rr1m`Y<u{mwbyQh`mfk8r%1j&rf-XpuFz?IAoZhK>Ei_~*yS(8*MgWIl9
zFeF+!M>cOzTkB=Xq7IBqhVz$4>A5>V(G(0sQp95^91aUDjdi^B(YqlbMC;Au9o~0f
z?S<dYlS*W$sr6tOX88^$(>ZLaptq}o^hk`emxgI;bYrtw2{iio`ln0ihQwjF^2F1t
zc=q`xXC!aqNa)7yUk)GQ+SL$Vx0O69Bhdtr;S601f~;INpRsV1!Eg*MUt}~@ptrZ3
ztkp##sd44<5HG#{0zHcs%(!kPC+k0c=wR^IpU*I-+D^@!T0o)Xku`27Ub9HvFi~Aj
z#$!oTX%Lv($Z)#Iq?V(uxtWI^T|KivD(Ac*8ISKddf+RhY2tKPu_yvnRq=V9_%SGz
zlW9>=O#_c&qB!gfCi7@Hg9lfy#qFz_S<*KPP0Agyp`pGLKYouiiYSUGn~cSx;43Mt
zaxi8HEP&t0q4@ozO@*d~4^ZFKJi7^1RF`dYB9Z7jdE_Y3aENF$NtM@u%Vwdc!ACf6
zq8kRSc0p73LIU?KM|HUW-8OGgUN-uXNH`d|c9nQ^h{=fzF1<iipdL|GM|(#Hb#vSA
y%;<0J0=KoMr9hzae+2mbf3>FBdf0z$rhfq!7BMsS7R}xO0000<MNUMnLSTZVo<`XK

literal 0
HcmV?d00001

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 02624cf2..46f752c7 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -57,11 +57,7 @@
               <div
                 class="taskbox"
                 style="
-                  background: linear-gradient(
-                    180deg,
-                    rgba(254, 243, 221, 1) 100%,
-                    rgba(255, 250, 240, 1) 100%
-                  );
+                  background: linear-gradient(180deg,#FEF3DD,#FFFAF0);
                 "
               >
                 <div class="leftt">
@@ -81,11 +77,7 @@
               <div
                 class="taskbox"
                 style="
-                  background: linear-gradient(
-                    180deg,
-                    rgba(221, 234, 255, 1) 100%,
-                    rgba(240, 248, 254, 1) 100%
-                  );
+                  background: linear-gradient(180deg,rgba(221, 234, 255, 1),rgba(240, 248, 254, 1));
                 "
               >
                 <div class="leftt">
@@ -106,11 +98,7 @@
                 class="taskbox"
                 @click="showModal"
                 style="
-                  background: linear-gradient(
-                    180deg,
-                    rgba(229, 246, 236, 1) 100%,
-                    rgba(238, 249, 243, 1) 100%
-                  );
+                  background: linear-gradient(180deg,rgba(229, 246, 236, 1) ,rgba(238, 249, 243, 1));
                 "
               >
                 <div class="leftt">
@@ -465,7 +453,94 @@
                 <div class="split"></div>
                 <div class="content3">
                     <a-tabs v-model:activeKey="activeKey1">
-                        <a-tab-pane key="8" tab="学员管理">学员管理</a-tab-pane>
+                        <a-tab-pane key="8" tab="学员管理">
+                            <div class="group">
+                                <div class="groupleft">
+                                    <div style="display: flex;align-items: center;margin-right: 10px;margin-bottom: 10px">
+                                      <div class="groupname" style="width: 42px">姓名：</div>
+                                      <a-input v-model:value="value" placeholder="请输入姓名" />
+                                    </div>
+                                    <div style="display: flex;align-items: center;margin-right: 10px;margin-bottom: 10px">
+                                      <div class="groupname">小组名称：</div>
+                                      <a-input v-model:value="value" placeholder="请输入小组名称" />
+                                    </div>
+                                    <div style="display: flex;align-items: center;margin-right: 10px;margin-bottom: 10px">
+                                      <div class="groupname" style="width: 42px">部门：</div>
+                                      <a-select v-model:value="value" placeholder="请选择部门" />
+                                    </div>
+                                    <div style="display: flex;align-items: center;margin-bottom: 10px">
+                                      <div class="groupname" style="width: 42px">学员：</div>
+                                      <a-select v-model:value="value" placeholder="是否为优秀学员" :options="goodstuList"/>
+                                    </div>          
+                                </div>
+                                <div class="groupright">
+                                    <div class="btn1">
+                                        <img src="../../assets/images/courseManage/search0.png"/>
+                                        <span class="btn1text">搜索</span>
+                                    </div>
+                                    <div class="btn2">
+                                        <img src="../../assets/images/courseManage/reset1.png"/>
+                                        <span class="btn2text">重置</span>
+                                    </div>
+                                </div>                                                  
+                            </div>
+                            <div class="second2" style="margin-top: 20px">
+                                    <div class="btn1" @click="showModal2">
+                                        <img src="../../assets/images/courseManage/add0.png"/>
+                                        <span class="btn1text">添加学员</span>
+                                    </div>
+                                    <div class="btn2">
+                                        <img src="../../assets/images/courseManage/reset2.png"/>
+                                        <span class="btn2text">导入学员</span>
+                                    </div>
+                                    <div class="btn2">
+                                        <img src="../../assets/images/projectadd/delete.png"/>
+                                        <span class="btn2text">批量删除</span>
+                                    </div>
+                            </div>
+                            <div class="talk">
+                              <img class="im" src="../../assets/images/leveladd/gan.png" />
+                              <div class="xu">
+                                <span class="yi">已选择</span>
+                                <div style="width: 5px; display: inline-block"></div>
+                                <span class="th">2</span>
+                                <div style="width: 5px; display: inline-block"></div>
+                                <span class="yi">项</span>
+                                <span class="zon">列表选项总计：</span>
+                                <span class="yi">4</span>
+                                <span class="yi">条</span>
+                              </div>
+                              <div class="clear">清空</div>
+                            </div>
+                            <div class="tab" style="margin: 20px 32px 0 32px">
+                              <a-table
+                                style="border: 1px solid #f2f6fe"
+                                :columns="tablecolumns"
+                                :data-source="tabledata"
+                                :loading="tableDataTotal === -1 ? true : false"
+                                expandRowByClick="true"
+                                :scroll="{ x: 1400, y: 350 }"
+                                @expand="expandTable"
+                                :pagination="false"
+                                :row-selection="{
+                                  columnWidth: 30,
+                                  selectedRowKeys: selectedRowKeys,
+                                  onChange: onSelectChange,
+                                }"
+                              />
+                              <div class="pa">
+                                <a-pagination
+                                  showSizeChanger="true"
+                                  showQuickJumper="true"
+                                  hideOnSinglePage="true"
+                                  :pageSize="pageSize"
+                                  :current="currentPage"
+                                  :total="tableDataTotal"
+                                  class="pagination"
+                                />
+                              </div>
+                            </div>
+                        </a-tab-pane>
                         <a-tab-pane key="9" tab="小组管理" force-render>
                             <div class="group">
                                 <div class="groupleft">
@@ -474,7 +549,7 @@
                                 </div>
                                 <div class="groupright">
                                     <div class="btn1">
-                                        <img src="../../assets/images/courseManage/add0.png"/>
+                                        <img src="../../assets/images/courseManage/search0.png"/>
                                         <span class="btn1text">搜索</span>
                                     </div>
                                     <div class="btn2">
@@ -485,11 +560,11 @@
                             </div>
                             <div class="second2">
                                 <div class="btn1" @click="showModal2">
-                                        <img src="../../assets/images/courseManage/search0.png"/>
+                                        <img src="../../assets/images/courseManage/add0.png"/>
                                         <span class="btn1text">创建小组</span>
                                     </div>
                                     <div class="btn2">
-                                        <img src="../../assets/images/courseManage/reset1.png"/>
+                                        <img src="../../assets/images/courseManage/reset2.png"/>
                                         <span class="btn2text">随机分组</span>
                                     </div>
                             </div>
@@ -513,12 +588,98 @@
                                         </div>
                                         <div class="grofooter">
                                             <div class="ftext">组员名单 ></div>
-                                            <div></div>
+                                            <div class="peoples">
+                                              <div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
+                                              <div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
+                                              <div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
+                                              <div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="groupbox">
-
+                                    <div style="width: 90%">
+                                        <div class="grouptitle">
+                                            <div class="goodgruop">全能小组</div>
+                                            <div class="more">
+                                                <span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
+                                                <div class="moreItems">
+                                                    <div class="sammo">编辑</div>
+                                                    <div class="sammo">删除</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="leader">组长：小李</div>
+                                        <div class="grocenter">
+                                            <div class="leader1">进度</div>
+                                            <a-progress :percent="55" />
+                                        </div>
+                                        <div class="grofooter">
+                                            <div class="ftext">组员名单 ></div>
+                                            <div class="peoples">
+                                              <div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
+                                              <div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
+                                              <div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
+                                              <div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="groupbox">
+                                    <div style="width: 90%">
+                                        <div class="grouptitle">
+                                            <div class="goodgruop">宇宙第一最强小组</div>
+                                            <div class="more">
+                                                <span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
+                                                <div class="moreItems">
+                                                    <div class="sammo">编辑</div>
+                                                    <div class="sammo">删除</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="leader">组长：小李</div>
+                                        <div class="grocenter">
+                                            <div class="leader1">进度</div>
+                                            <a-progress :percent="55" />
+                                        </div>
+                                        <div class="grofooter">
+                                            <div class="ftext">组员名单 ></div>
+                                            <div class="peoples">
+                                              <div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
+                                              <div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
+                                              <div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
+                                              <div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="groupbox">
+                                    <div style="width: 90%">
+                                        <div class="grouptitle">
+                                            <div class="goodgruop">天天向上小组</div>
+                                            <div class="more">
+                                                <span style="color: rgba(0, 0, 0, 0.4500); cursor: pointer">. . .</span>
+                                                <div class="moreItems">
+                                                    <div class="sammo">编辑</div>
+                                                    <div class="sammo">删除</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="leader">组长：小李</div>
+                                        <div class="grocenter">
+                                            <div class="leader1">进度</div>
+                                            <a-progress :percent="55" />
+                                        </div>
+                                        <div class="grofooter">
+                                            <div class="ftext">组员名单 ></div>
+                                            <div class="peoples">
+                                              <div class="people1"><img src="../../assets/images/taskpage/people1.png"/></div>
+                                              <div class="people2"><img src="../../assets/images/taskpage/people2.png"/></div>
+                                              <div class="people3"><img src="../../assets/images/taskpage/people3.png"/></div>
+                                              <div class="people4"><img src="../../assets/images/taskpage/people4.png"/></div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </a-tab-pane>
@@ -555,11 +716,7 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
-            background: linear-gradient(
-              0deg,
-              rgba(78, 166, 255, 0) 0%,
-              rgba(78, 166, 255, 0.2) 100%
-            );
+            background: linear-gradient(0deg,rgba(78, 166, 255, 0) 0%,rgba(78, 166, 255, 0.2) 100%);
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
@@ -625,13 +782,13 @@
         :closable="false"
         wrapClassName="doublepro"
         width="624px"
-        height="476px"
+        height="332px"
         >
         <div class="modalHeader" 
               style="width: 100%;height: 68px;display: flex;align-items: center;justify-content: space-between;background:linear-gradient(0deg,rgba(78, 166, 255, 0) 0%,rgba(78, 166, 255, 0.2000) 100%)"
             >
             <div class="headerLeft" style="margin-left: 32px">
-              <span class="headerLeftText" style="font-size: 16px">创建多层项目</span>
+              <span class="headerLeftText" style="font-size: 16px">创建小组</span>
             </div>
             <div style="cursor: pointer;margin-right:32px" @click="closeModal2">
               <img
@@ -648,28 +805,11 @@
                 src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
-            <div class="inname">项目名称:</div>
+            <div class="inname">小组名称:</div>
             <div class="in">
               <a-input
                 v-model:value="value"
-                show-count :maxlength="30"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">分类:</div>
-            <div class="in">
-              <a-select
-                v-model:value="value"
-                placeholder="四个养成"
+                placeholder="请输入小组名称"
                 style="border-radius: 8px;height: 40px"
               />
             </div>
@@ -681,26 +821,11 @@
                 src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
-            <div class="inname">项目经理:</div>
-            <div class="in">
-              <a-input
-                v-model:value="value"
-                placeholder="请选择项目经理"
-                style="border-radius: 8px;height: 40px"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">资源归属:</div>
+            <div class="inname">小组长:</div>
             <div class="in">
               <a-input
                 v-model:value="value"
+                placeholder="请输入小组长"
                 style="border-radius: 8px;height: 40px"
               />
             </div>
@@ -724,6 +849,143 @@ export default {
     components: { TimeManage, FaceManage },
     setup(){
         const state = reactive({
+            goodstuList: [
+              {
+                id: 1,
+                value: "全部",
+                label: "全部",
+              },
+              {
+                id: 2,
+                value: "普通学员",
+                label: "普通学员",
+              },
+              {
+                id: 3,
+                value: "优秀学员",
+                label: "优秀学员",
+              },
+            ],
+            tabledata: [
+              {
+                key: 1,
+                name: "小李",
+                bum: "产研部",
+                gangw: "产品经理",
+                group: "好好学习",
+                progress: "5/20",
+                diploma: "0",
+                stutime: "2022-10-31 23:12:00",
+                putin: "手动加入",
+              },
+              {
+                key: 2,
+                name: "小刘",
+                bum: "产研部",
+                gangw: "产品经理",
+                group: "天天向上",
+                progress: "5/20",
+                diploma: "0",
+                stutime: "2022-10-31 23:12:00",
+                putin: "手动加入",
+              },
+              {
+                key: 3,
+                name: "小王",
+                bum: "产研部",
+                gangw: "后端",
+                group: "好好学习",
+                progress: "5/20",
+                diploma: "0",
+                stutime: "2022-10-31 23:12:00",
+                putin: "手动加入",
+              },
+              {
+                key: 4,
+                name: "小赵",
+                bum: "产研部",
+                gangw: "前端",
+                group: "天天向上",
+                progress: "5/20",
+                diploma: "0",
+                stutime: "2022-10-31 23:12:00",
+                putin: "手动加入",
+              },
+            ],
+            tablecolumns: [
+              {
+                title: "姓名",
+                dataIndex: "name",
+                key: "name",
+                width: 30,
+                align: "left",
+                className: "h",
+              },
+              {
+                title: "部门",
+                dataIndex: "bum",
+                key: "bum",
+                width: 40,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "岗位",
+                dataIndex: "gangw",
+                key: "gangw",
+                width: 40,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "所属小组",
+                dataIndex: "group",
+                key: "group",
+                width: 40,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "进度",
+                dataIndex: "progress",
+                key: "progress",
+                width: 40,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "证书",
+                dataIndex: "diploma",
+                key: "diploma",
+                width: 40,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "最近学习时间",
+                dataIndex: "stutime",
+                key: "stutime",
+                width: 50,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "加入方式",
+                dataIndex: "putin",
+                key: "putin",
+                width: 40,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "操作",
+                dataIndex: "operations",
+                key: "operations",
+                width: 60,
+                align: "center",
+                className: "h",
+              },
+            ],
             visible: false, //时间管理
             FaceVisivle: false, //面授管理
             pubproject: false,
@@ -732,7 +994,7 @@ export default {
             checked1: true,
             checked2: false,
             activeKey: '3',
-            activeKey1: '9',
+            activeKey1: '8',
         });
         const showModal = () => {
             state.pubproject = true;
@@ -1498,6 +1760,7 @@ export default {
             justify-content: space-between;
             .groupleft {
                 display: flex;
+                flex-wrap: wrap;
                 align-items: center;
                 margin-left: 32px;
                 .groupname {
@@ -1511,6 +1774,12 @@ export default {
                     width: 264px;
                     height: 40px;
                 }
+                .ant-select-selector {
+                    border-radius: 8px;
+                    width: 264px;
+                    height: 40px;
+                    padding-top: 5px;
+                }
             }
             .groupright {
                 display: flex;
@@ -1576,7 +1845,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-        margin-right: 32px;
+        margin-right: 16px;
         border: 1px solid #409eff;
         border-radius: 8px;
         cursor: pointer;
@@ -1588,8 +1857,83 @@ export default {
         }
       }
     }
+    .talk {
+          margin-top: 24px;
+          margin-left: 32px;
+          margin-right: 32px;
+          margin-bottom: 11px;
+          position: relative;
+          //width: 90%;
+          height: 40px;
+          background: #f5faff;
+          border: 1px solid #4ea6ff;
+          // opacity: 0.22;
+          display: flex;
+          align-items: center;
+          .im {
+            width: 14px;
+            height: 15px;
+            margin-left: 17px;
+          }
+          .xu {
+            height: 100%;
+            line-height: 40px;
+            margin-left: 13px;
+            .yi {
+              color: #4f5156;
+              font-size: 14px;
+            }
+            .zon {
+              color: #999ba3;
+              font-size: 14px;
+              margin-left: 34px;
+            }
+            .th {
+              color: #4ea6ff;
+            }
+          }
+          .clear {
+            cursor: pointer;
+            font-size: 14px;
+            color: #387DF7;
+            line-height: 24px;
+            position: absolute;
+            right: 20px;
+          }
+    }
+    .tab {
+        .ant-table-thead > tr > th {
+          background-color: rgba(239, 244, 252, 1);
+          color: rgba(0, 0, 0, 0.8500);
+        }
+        .ant-table-tbody > tr > td {
+          border-bottom: 1px solid #F0F6FC;
+          color: rgba(0, 0, 0, 0.6500);
+        }
+        th.h {
+          background-color: #eff4fc !important;
+        }
+        
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
+          background: rgba(250, 250, 250, 1);
+        }
+        .pa {
+          // left: 0;
+          margin-top: 15px;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: right;
+          // position: absolute;
+          // bottom: 20px;
+        }
+    }
     .groupmain {
             display: flex;
+            flex-wrap: wrap;
             margin-left: 32px;
             .groupbox {
                 width: 264px;
@@ -1697,6 +2041,26 @@ export default {
                         color: rgba(56, 139, 225, 1);
                         font-size: 14px;
                     }
+                    .peoples {
+                        display: flex;
+                        position: relative;
+                        .people1 {
+                          position: absolute;
+                          right: 22px;
+                        }
+                        .people2 {
+                          position: absolute;
+                          right: 31px;
+                        }
+                        .people3 {
+                          position: absolute;
+                          right: 40px;
+                        }
+                        .people4 {
+                          position: absolute;
+                          right: 49px;
+                        }
+                    }
                 }
             }
         }