From da2e87a940a279a8dfb725c8f971f709d765a814 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, 11 Oct 2022 17:55:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                |    1 +
 src/assets/images/projectadd/delete.png  |  Bin 0 -> 306 bytes
 src/assets/images/projectadd/delete1.png |  Bin 0 -> 269 bytes
 src/assets/images/projectadd/keep.png    |  Bin 0 -> 1201 bytes
 src/assets/images/projectadd/right.png   |  Bin 0 -> 246 bytes
 src/views/projectcenter/TaskAdd.vue      | 1208 ++++++++++++++++++++++
 src/views/projectcenter/TaskPage.vue     |   21 +-
 src/views/research/ResearchAdd.vue       |    1 +
 8 files changed, 1221 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/images/projectadd/delete.png
 create mode 100644 src/assets/images/projectadd/delete1.png
 create mode 100644 src/assets/images/projectadd/keep.png
 create mode 100644 src/assets/images/projectadd/right.png
 create mode 100644 src/views/projectcenter/TaskAdd.vue

diff --git a/README.md b/README.md
index 3dee4fd0..8e7d558b 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ LevelAddDetail.vue:创建关卡页面
 ProjectManage.vue:项目页面
 ProjectAdd.vue:创建项目页面
 TaskPage.vue:任务页面
+TaskAdd.vue:创建任务页面
 TemplateLibrary.vue:模板页面
 
 ```
diff --git a/src/assets/images/projectadd/delete.png b/src/assets/images/projectadd/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1578bba12adc973969f604f2e92e5d619d70b4b
GIT binary patch
literal 306
zcmV-20nPr2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#>`6pHR5(xVQZa7AKoFdP7vu#L6!eHDO5rm-kKmkwDnj`{#0M;tDg{0sL5tuh
zA~!sN6zL=J0@&y*WF7Vemuc8$wL7EH?(7nQh>T<ex;`Yp*G@C3(phb&Ox7TJ01g$*
z3I15kzTdA47&$^PvkB)uQDrg(@n$t2t^{HusQ}~9Dos5C%VL7q$V(GBgl{$9Yb#s?
zQ<t}zuc12Vf%0}&Myw-QP35v*SG_1FxC<0Ul@Ij)CPqscx%2JDT)FJmx6YUY7y$Te
z_{t{$d#m~Ac;z1q7t%SmF@c}}{tO~-o$#@F=C|Yg0tf5GeOiMs&;S4c07*qoM6N<$
Ef|7204gdfE

literal 0
HcmV?d00001

diff --git a/src/assets/images/projectadd/delete1.png b/src/assets/images/projectadd/delete1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b51497f33b1fbd7deb9e8b2e8529b5f6e77938c9
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#$4Nv%R5(xVl06PVK@^3*vji(pDD<KcjSX0YXjCFLAT}VP(uhT96&lf40)<{;
z2}j<`czMPIrNVUg-jnbCoDqp<dj-^@(pgeJmMc!!-U4;t6xA}|RZ^pzPXTVgRMNaG
zv^@eQk}6LC+cTh-TIGw}I-kJy@C)&aMAG7Ag#gT^Lee-DCvRZ8*xmLn06GCs#PKbP
z3I2fG%HKL-H`urdHWu+a8xKGe*njwyZQv-Wl{a~aZC8N-kQd&(tkF`^CDYsi4eYp_
TrX30B00000NkvXXu0mjfECg)c

literal 0
HcmV?d00001

diff --git a/src/assets/images/projectadd/keep.png b/src/assets/images/projectadd/keep.png
new file mode 100644
index 0000000000000000000000000000000000000000..98bec4c72cb9e0e5c30f8280fd62ea5304f5d7de
GIT binary patch
literal 1201
zcmV;i1Wx;jP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400001b5ch_0Itp)
z=>Px(Ye_^wR9HvVnOkUFRTPH*b;dHc*koohl{1+{NrtGzOKJi|A`&kkNGsYtc)_Zu
zsI8zcRUdqB5q(Gni{Mi<K2%f?t0Gtsw6tIgp+zG#6{MY+*qM{qkmO8K<}BHBN#}BA
z&OUpl(Vo}6{<Xfd_u99$2`zr-a~BiWS)Q#-Jjkr+MBD)oF<VO-(VWFNOCCNQ^LEd)
z5{gvB7gmhB3H&q>?Eug#=_3u`2%t^rzOJ8$h$VFeGgqLg<?N%-=xqR_Zi3X>GH?b=
z`(yslXGCPl_>uxmt!8h5r5ytJJ{hO7HUu2c=e51@j?lD|#t}4?GhPB?0)XGinPU58
zFy7Mr;fZGH&=8cFJt@<8pNRG<0=SgXC%P~60uf!d6WW3b$aK#57@((IMr+mln+0EZ
z=Md3ats`5|l$kvQ(4JPKs_FSt-51$in+A2DNz-_dfREIIv`0mZH}pW{y-IIYpvBou
zrvL=n6H?jB8Z2up7L1-Od#D0Uo5l|eJkZR2(llV^SCt479Wi+wVOsZwM~Nt3wcyX?
z=C@nSUpMpg!MP)tT}oA%ygINQvrB1w|F;;3`tP9|Mv&;xA+&vgD8{3AU~AWaBrxrc
z`NLCHph?p>LBO^~9x|(!u>beNb<J)-%i@tx0y}%g5b$`NfM;}H_%^Y76^1^woEd?p
zt>=TCTJ)somD*1QRQS00`Z!+cf7l5W7Wl!qzx!wrbj6qe;q_*!c7uvo;wL5Yb~5IV
zJXZuYv$Fs-O`JxcPxg)%a_@`eG28##)iZ|afBv-1VM)-e?h9|BlsVrA@Lx`2&<J$6
zs~@*_-h{il61Fac?#Ij-{JK~lLJ|~~M;oSOF7pVn_LVBAldf62EGU7WrR2)|n?(GM
zQ@}<&>ZEH2C_o1&nKRxc#y+Qj|1BscDP<ZT0(jXis8`#B-ar%sLETAOXwR-)!p!1%
ztW@l3vO^ETm&%|!^li9*%bj&QRU>M#41J#b8OO4}t(&+4RULY#g}xTJaw{#jNrM8D
z%9CkhK?{>fZF$;A(8BVhy5MglXko!GZlT6G0R3+E`p0|k#n9#(*Cz*+PPW{jtRQx<
zlM8>~=*25HW62yXZlR?^$w3faa|0@7aopdHq0N1g%hMuGEzDM}5|W@5hmz&YC^YRC
zH=t5<4n{JdRmVKxPxav33h=(cUFh*gnz^VxI15YFtB5M7NFC9m%|Dx~h!9-u%Uv0&
zb5jseZ>IxegUelEQvHvv%VhCAda!$a-dvjni1Jum6D1u1D~e=ux%nvuo=}}Ein?zX
zeBsBWi)3ZkjV(L!l<tc>@2c!r*&C%o?m+-P#a?ofwN}Wjf?dttS}Ki?J4JQV&cF%I
zYkS&K8ZQTCW=fkz@v(t1;s&VJw)EI=Am$GpZtG)1Z6NV{qY*y?kl0${lF(@azGG;U
zSN-|M4(LKIGw89j;o^fBbRr4@qyg44fzlS!S<S<zb#LU#Wl8eSD$V`{Habu9q`<Ig
P00000NkvXXu0mjfz9dD{

literal 0
HcmV?d00001

diff --git a/src/assets/images/projectadd/right.png b/src/assets/images/projectadd/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..995670c61b05920b6318bab30cb260980a55f92f
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Hh8)?hFJLT
zoovW;C_upFeunBR+cj@>RCYEgyyUH5(p{5l<60!Tcq;pZ3WnWR#1=j1N>ZF5-w}VO
zY})ZRZ`K{U!soyr-Wg_g@up_`O37oK8}+lbtXL|Sc$+emMXqVQ?Ap3ud2>Bu+sd!A
zmFmwgnbvHuku|BN`J&mikA^qR8>Tv5Y{-z!{>;cB6z%16y2v<#dzb#(tYc^R89v|d
t4=Clnr&zUq<C)mCJa-t*r+=z?Zk@EMbFr$Kj~dYJ44$rjF6*2UngFUDU>5)Y

literal 0
HcmV?d00001

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
new file mode 100644
index 00000000..1a642635
--- /dev/null
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -0,0 +1,1208 @@
+<template>
+  <div class="allCon">
+    <div class="left clearfix">
+      <div class="leftmain">
+        <div class="tit">阶段<img src="../../assets/images/projectadd/right.png" style="margin-left: 10px"/></div>
+        <div class="btn btn3">
+          <div class="search"></div>
+          <div class="btnText">添加阶段</div>
+        </div>
+        <div class="maincon">
+          <div class="item" v-for="item in level" :key="item.id">
+            <div class="itemle">
+              <div class="tit">{{ item.tit }}</div>
+              <div class="name">{{ item.name }}</div>
+            </div>
+            <div class="itemri">
+              <img src="../../assets/images/leveladd/z1.png" />
+              <img
+                style="margin-top: 40px"
+                src="../../assets/images/leveladd/z2.png"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="right">
+      <div class="addhead">
+        <div class="filt">
+          <div class="le">
+            <div class="leftimg">
+              <img class="img" src="../../assets/images/projectadd/picture.png" />
+            </div>
+            <div class="imgfor">
+              <div class="forz" style="font-weight: 500">管理者进阶-腾飞班</div>
+            </div>
+          </div>
+          <div class="rightt">
+            <div class="select">
+              <a-select
+                v-model:value="projectName"
+                style="width: 270px"
+                placeholder="自由学习模式"
+                :options="projectNameList"
+                @change="selectProjectName"
+                allowClear
+                showSearch
+              ></a-select>
+            </div>
+            <div class="line"></div>
+            <img class="img2" src="../../assets/images/projectadd/keep.png" />
+            <div class="pub">保存</div>
+            <div class="line"></div>
+            <img class="img2" src="../../assets/images/leveladd/back.png" />
+            <router-link to="/taskpage">
+              <div class="return">返回</div></router-link
+            >
+          </div>
+        </div>
+      </div>
+      <div class="mid">
+        <!-- <div class="item" v-for="(item, index) in mid" :key="item.id">
+          <div class="itcon">
+            <div class="img">
+              <img :src="item.img" />
+            </div>
+            <div class="text">{{ item.title }}</div>
+          </div>
+          <div :class="[index === mid.length - 1 ? 'no' : 'lin']"></div>
+        </div> -->
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/zai.png" />
+            </div>
+            <div class="text">在线</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/mian.png" />
+            </div>
+            <div class="text">面授</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/an.png" />
+            </div>
+            <div class="text">案例</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/zuo.png" />
+            </div>
+            <div class="text">作业</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/kao.png" />
+            </div>
+            <div class="text">考试</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/zhi.png" />
+            </div>
+            <div class="text">直播</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/wai.png" />
+            </div>
+            <div class="text">外链</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/tao.png" />
+            </div>
+            <div class="text">讨论</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/huo.png" />
+            </div>
+            <div class="text">活动</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/ce.png" />
+            </div>
+            <div class="text">测评</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/diao.png" />
+            </div>
+            <div class="text">调研</div>
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon">
+            <div class="img">
+              <img src="../../assets/images/leveladd/tou.png" />
+            </div>
+            <div class="text">投票</div>
+          </div>
+        </div>
+      </div>
+      <div class="boom">
+        <div class="boomcen">
+          <div class="onerow">
+                    <div class="taskmain">任务列表</div>
+                    <button class="btn">移动到任务阶段</button>
+                    <div class="edit">
+                        <img class="editimg" src="../../assets/images/projectadd/delete.png"/>
+                        <span class="editext">批量删除</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">3</span>
+              <div style="width: 5px; display: inline-block"></div>
+              <span class="yi">项</span>
+              <span class="zon">人物总数：</span>
+              <span class="yi">5</span>
+              <span class="yi">条</span>
+            </div>
+          </div>
+          <div class="tableBox">
+            <a-table
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tableData"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              :scroll="{ x: 1500, y: 300 }"
+              @expand="expandTable"
+              :pagination="false"
+            />
+            <!-- :pagination= showSizeChanger: true, showQuickJumper: true,
+      hideOnSinglePage: true, pageSizeOptions: [], pageSize: pageSize, current:
+      currentPage, total: tableDataTotal, -->
+            <div class="pa">
+              <a-pagination
+                showSizeChanger="true"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="draw" style="position: relative">
+        <a-drawer
+          v-model:visible="visible"
+          class="drawerStyle"
+          title="关联项目"
+          placement="right"
+          width="50%"
+          @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>
+</template>
+
+<script>
+import { reactive, toRefs } from "vue";
+const drawercolumns = [
+  {
+    title: "项目名称",
+    dataIndex: "projectName",
+    key: "projectName",
+    width: 200,
+    // align: "center",
+    ellipsis: true,
+    // scopedSlots: { customRender: "action" }, //引入的插槽
+    // customRender: (text, record) => {
+    //   console.log(text, record);
+    //   return <span>{text.text}</span>;
+    // },
+  },
+  {
+    title: "项目经理",
+    dataIndex: "manager",
+    key: "manager",
+    width: 100,
+    align: "center",
+  },
+
+  {
+    title: "创建人",
+    dataIndex: "creater",
+    // width: "30%",
+    key: "creater",
+    width: 100,
+    align: "center",
+  },
+  {
+    title: "创建时间",
+    dataIndex: "time",
+    key: "time",
+    width: 180,
+    align: "center",
+  },
+];
+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: "删除任务",
+        },
+        {
+          id: 3,
+          value: "移动任务到关卡",
+          label: "移动任务到关卡",
+        },
+      ],
+      level: [
+        {
+          id: "1",
+          tit: "阶段1",
+          name: "腾飞班1基础",
+        },
+        {
+          id: "2",
+          tit: "阶段2",
+          name: "腾飞班1基础",
+        },
+      ],
+      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: 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: "-",
+          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,
+    });
+    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: 90,
+          align: "center",
+          className: "h",
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <div class="img"></div>
+                <a-checkbox class="ch" v-model: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: 200,
+          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"
+                    v-model:checked={text.record.checked1}
+                    size="small"
+                    active-color="red"
+                  />
+                  <div class="showt clearfix">
+                    <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 class="opacation">
+                  <span style="color:#4EA6FF;margin-right:25px;cursor:pointer">
+                    编辑
+                  </span>
+                  <span style="color:#4EA6FF;cursor:pointer">删除</span>
+                </div>
+              </div>
+            );
+          },
+        },
+      ];
+      return columns;
+    };
+
+    return {
+      ...toRefs(state),
+      selectProjectName,
+      selectProjectName2,
+      tableDataFunc,
+      showDrawer,
+      afterVisibleChange,
+      drawercolumns,
+    };
+  },
+};
+</script>
+
+<style  lang="scss" >
+.clearfix:after,
+.clearfix:before {
+  content: " ";
+  display: block;
+  clear: both;
+}
+
+.drawerStyle {
+  .ant-drawer-content-wrapper {
+    max-width: 1000px;
+    .ant-drawer-header {
+      display: none !important;
+    }
+    .ant-drawer-body {
+      padding: 0;
+    }
+  }
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: scroll;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .drawerbox {
+      margin: 20px 38px 30px;
+      th {
+        background-color: #eff4fc !important;
+      }
+
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
+    }
+    .btnn {
+      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;
+      }
+    }
+  }
+}
+.allCon {
+  width: 100%;
+  height: 100%;
+  background-color: #f1f4f8;
+  display: flex;
+  .left {
+    margin-right: 20px;
+    width: 208px;
+    flex-shrink: 0;
+    height: 100%;
+    background: #ffffff;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+    display: flex;
+    justify-content: center;
+    .leftmain {
+      width: 86%;
+      margin-top: 20px;
+      .tit {
+        font-size: 18px;
+        color: #363636;
+      }
+
+      // flex-wrap: wrap;
+      .btn {
+        margin-top: 20px;
+        // padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #fff6e8;
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        // margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+        .search {
+          background-size: 100%;
+        }
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffb64e;
+          // line-height: 38px;
+          margin-top: 4px;
+          margin-left: 5px;
+        }
+      }
+
+      .btn3 {
+        margin-right: 0px;
+        .search {
+          width: 17px;
+          height: 18px;
+          background-image: url("../../assets/images/leveladd/add.png");
+          background-size: 100% 100%;
+        }
+      }
+      .maincon {
+        margin-top: 17px;
+        width: 100%;
+        // background-color: #bfa;
+        .item {
+          width: 100%;
+          height: 83px;
+          display: flex;
+          background: rgba(255, 182, 78, 0.1);
+          border: 1px solid #ffb64e;
+          opacity: 0.45;
+          border-radius: 8px;
+          margin-bottom: 17px;
+          align-items: center;
+          position: relative;
+          .itemle {
+            margin-left: 17px;
+            .tit {
+              color: black;
+              // color: red;
+              font-size: 14px;
+              margin-bottom: 8px;
+              font-weight: bold;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              overflow: hidden;
+              width: 100px;
+            }
+            .name {
+              font-size: 14px;
+              color: #878b92;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              overflow: hidden;
+              width: 100px;
+            }
+          }
+          .itemri {
+            display: flex;
+            flex-direction: column;
+            position: absolute;
+            right: 16px;
+          }
+        }
+      }
+    }
+  }
+  .right {
+    flex: 1;
+    height: 100%;
+    width: 100%;
+    // background-color: #fff;
+    display: flex;
+    flex-direction: column;
+    .addhead {
+      width: 100%;
+      // min-width: 500px;
+      // height: 130px;
+
+      background-color: #fff;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+      display: flex;
+      align-items: center;
+      position: relative;
+      .filt {
+        margin: 16px 30px 16px 22px;
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        align-items: center;
+        flex-wrap: wrap;
+        .le {
+          display: flex;
+          align-items: center;
+          // margin-bottom: 10px;
+          .leftimg {
+            width: 151px;
+            height: 100px;
+            border: 10px solid #e7f2ff;
+            border-radius: 8px;
+            margin-left: 20px;
+            .img {
+              width: 100%;
+              height: 100%;
+            }
+          }
+          .imgfor {
+            margin-left: 32px;
+            .forz {
+              color: #363636;
+              font-size: 16px;
+            }
+            .fort {
+              color: #878b92;
+              font-size: 14px;
+              margin-top: 20px;
+            }
+          }
+        }
+
+        .rightt {
+          // width: 500px;
+          height: 100%;
+          // background-color: red;
+          // position: absolute;
+          // right: 0;
+          display: flex;
+          align-items: center;
+          .select {
+            margin-right: 50px;
+            // margin-bottom: 20px;
+          }
+          .line {
+            height: 60px;
+            width: 1px;
+            background-color: #e8effa;
+            margin-right: 28px;
+          }
+          .img2 {
+            width: 42px;
+            height: 42px;
+            margin-right: 22px;
+          }
+          .pub {
+            color: #57C887;
+            font-size: 14px;
+            margin-top: 5px;
+            margin-right: 30px;
+          }
+          .return {
+            color: #4ea6ff;
+            font-size: 14px;
+            margin-top: 5px;
+            margin-right: 20px;
+          }
+
+          .role {
+            display: flex;
+            align-items: center;
+            font-size: 16px;
+            font-weight: 400;
+            color: #333330;
+            line-height: 36px;
+            cursor: pointer;
+            position: relative;
+            margin-right: 20px;
+            .roleArrow {
+              width: 13px;
+              height: 7px;
+              margin-left: 8px;
+              background-image: url(../../assets/images/navtop/down.png);
+              background-size: 100%;
+            }
+            .roleItems {
+              width: 109px;
+              height: 90px;
+              padding-top: 10px;
+              background: #ffffff;
+              box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+              position: absolute;
+              top: 35px;
+              right: 0px;
+              text-align: center;
+              display: none;
+              z-index: 100;
+            }
+            .roleItem {
+              font-size: 14px;
+              font-weight: 400;
+              color: rgba(79, 81, 86, 1);
+              line-height: 36px;
+            }
+            .roleItem:hover {
+              color: #4ea6ff;
+            }
+          }
+          .role:hover .roleItems {
+            display: block;
+          }
+          .role:hover .roleArrow {
+            background-image: url(../../assets/images/navtop/up.png);
+          }
+        }
+      }
+    }
+
+    .mid {
+      width: 100%;
+      height: 130px;
+      margin-top: 20px;
+      margin-bottom: 20px;
+      background-color: #fff;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+      display: flex;
+      align-items: center;
+      .item {
+        height: 100%;
+        width: 7.7%;
+        display: flex;
+        align-items: center;
+        .itcon {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          height: 100%;
+          width: 100%;
+          .img {
+            cursor: pointer;
+          }
+          .text {
+            font-size: 16px;
+            color: #363636;
+            margin-top: 5px;
+          }
+        }
+        .lin {
+          width: 1px;
+          height: 60%;
+          background-color: #e8effa;
+        }
+        .no {
+          display: none;
+        }
+      }
+    }
+    .boom {
+      position: relative;
+      width: 100%;
+      flex: 1;
+      background-color: #fff;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+      display: flex;
+      justify-content: center;
+      .boomcen {
+        width: 95%;
+        height: 100%;
+        // background-color: #bfa;
+        .onerow {
+            width: 100%;
+            display: flex;
+            height: 40px;
+            position: relative;
+            margin-top: 20px;
+            .taskmain {
+                font-size: 18px;
+                color: #000000;
+            }
+            .btn {
+                position: absolute;
+                top: 0;
+                right: 130px;
+                background-color: #409EFF;
+                width: 130px;
+                height: 40px;
+                border-radius: 8px;
+                border: 1px solid #409EFF;
+                color: #FFFFFF;
+                cursor: pointer;
+            }
+            .edit {
+                position: absolute;
+                right: 0;
+                top: 0;
+                color: #409EFF;
+                width: 120px;
+                height: 40px;
+                border: 1px solid #409EFF;
+                border-radius: 8px;
+                .editimg {
+                    width: 15px;
+                    height: 15px;
+                    margin-top: -2px;
+                    margin-left: 25px;
+                    margin-right: 5px;
+                } 
+                .editext {
+                    line-height: 40px;
+                }               
+            }
+            .edit:hover {
+                color: #FFFFFF;
+                background-color: #409EFF;
+                cursor: pointer;
+                .editimg {
+                    background-image: url("../../assets/images/projectadd/delete1.png");
+                }
+            }
+        }
+        .talk {
+          margin-top: 24px;
+          margin-bottom: 11px;
+          width: 100%;
+          height: 50px;
+          background: #f5faff;
+          border: 1px solid #4ea6ff;
+          // opacity: 0.22;
+          display: flex;
+          align-items: center;
+          .im {
+            width: 14px;
+            height: 15px;
+            margin-left: 27px;
+          }
+          .xu {
+            height: 100%;
+            line-height: 50px;
+            margin-left: 13px;
+            .yi {
+              color: #4f5156;
+              font-size: 14px;
+            }
+            .zon {
+              color: #999ba3;
+              font-size: 14px;
+              margin-left: 34px;
+            }
+            .th {
+              color: #4ea6ff;
+            }
+          }
+        }
+        .tableBox {
+          // margin: 20px 38px 30px;
+          th.h {
+            background-color: #eff4fc !important;
+          }
+
+          .ant-table-tbody
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
+            background: #f6f9fd;
+          }
+          .pa {
+            left: 0;
+            width: 100%;
+            // height: 20px;
+            // background-color: red;
+            display: flex;
+            justify-content: center;
+            position: absolute;
+            bottom: 20px;
+          }
+        }
+      }
+    }
+    // .drawerbox {
+    //   // margin: 20px 38px 30px;
+    //   th.h {
+    //     background-color: #eff4fc !important;
+    //   }
+
+    //   .ant-table-tbody
+    //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+    //     > td {
+    //     background: #f6f9fd;
+    //   }
+    // }
+    .draw {
+      .drawerbox {
+      }
+    }
+  }
+
+  .opat {
+    .opacationt {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .ant-switch-checked {
+        background-color: #5dc988;
+      }
+      .showt {
+        // margin-top: 10px;
+        display: flex;
+        margin-left: 10px;
+        height: 23px;
+        .bi {
+          // margin-top: 10px;
+          width: 63px;
+          height: 23;
+          background-color: #5dc988;
+          line-height: 23px;
+          position: absolute;
+          z-index: 998;
+          color: #ffffff;
+          border-radius: 4px;
+        }
+        .xuan {
+          width: 63px;
+          height: 23px;
+          background-color: #f2f6fc;
+          line-height: 23px;
+          // display: none;
+          position: absolute;
+          z-index: 998;
+          color: #5dc988;
+          border-radius: 4px;
+        }
+      }
+    }
+  }
+  .racona {
+    // background-color: #bfa;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    .img {
+      margin-left: -40px;
+      margin-top: -2px;
+      width: 17px;
+      height: 14px;
+      background-image: url("../../assets/images/leveladd/z1.png");
+    }
+    .ch {
+      margin-left: 10px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index cdcb8dc4..79f87126 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -20,7 +20,7 @@
             <div class="end">
                 <div style="margin-top: 20px;margin-left: 10px">
                     <img class="endimg" src="../../assets/images/leveladd/more.png"/>
-                    <div class="tableSelect" style="margin-left: 10px">
+                    <div class="tableSelect" style="margin-left: 10px;margin-right: 20px">
                   <a-select
                     style="width: 50px; color: #7096E3"
                     value="更多"
@@ -40,12 +40,11 @@
                 </div>
             </div>
             <div class="end">
-                 <div style="margin-top: 20px;margin-left: 10px">
+                 <div style="margin-top: 20px;margin-left: 10px;margin-right:30px">
                     <img class="ending" src="../../assets/images/leveladd/back.png" />
                     <span class="endtext" style="color:#4EA6FF">返回</span>
                 </div>
             </div>
-
         </div>
     </div>
     <div class="split"></div>
@@ -258,10 +257,11 @@
     width: 100%;
     display: flex;
     flex-direction: column;
-    position: relative;
+    //position: relative;
     .header {
         width: 100%;
         display: flex;
+        flex-wrap: wrap;
         .box {
             border: 12px solid #E7F2FF;
             margin: 16px 0 16px 19px;
@@ -270,12 +270,13 @@
         }
         .imgfor {
             display: flex;
+            flex: 1;
             flex-direction: column;
             margin-top: 38px;
-            //margin-left: 15px;
+            margin-left: 15px;
             //float: left;
-            position: absolute;
-            left: 210px;
+            //position: absolute;
+            //left: 210px;
             .forz {
                 font-size: 16px;
                 color: #363636;
@@ -289,9 +290,9 @@
         }
         .right {
             display: flex;
-            position: absolute;
-            right: 10px;
-            top: 5px;
+            //position: absolute;
+            //right: 10px;
+            //top: 5px;
             //float: right;
             .end {
                 border-left: 1px solid #E8EFFA;
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 29dc7116..1726270e 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -278,6 +278,7 @@
         margin-bottom: 14px;
         .btn {
             display: flex;
+            margin-bottom: 20px;
             justify-content: center;
             cursor: pointer;
         }