From de96a19a9b942413f0d9e6c55532d788692da9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Tue, 18 Oct 2022 16:14:04 +0800 Subject: [PATCH] =?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)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 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 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)Px(j!8s8R7gvmm04_5RT#&A=gysd=`tnfxC=m=s3AlhSh#-r?14sgu66nmd(@v)|)0x}Z?!Cv%bV?{z zgPxn4+~j`ecmC&m=lg$xI~-CJ(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%tN3yaN)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`YEi_~*yS(8*MgWIl9 zFeF+!M>cOzTkB=Xq7IBqhVz$4>A5>V(G(0sQp95^91aUDjdi^B(YqlbMC;Au9o~0f z?SZLaptq}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{=fzF1FBdf0z$rhfq!7BMsS7R}xO0000
@@ -81,11 +77,7 @@
@@ -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)); " >
@@ -465,7 +453,94 @@
- 学员管理 + +
+
+
+
姓名：
+ +
+
+
小组名称：
+ +
+
+
部门：
+ +
+
+
学员：
+ +
+
+
+
+ + 搜索 +
+
+ + 重置 +
+
+
+
+
+ + 添加学员 +
+
+ + 导入学员 +
+
+ + 批量删除 +
+
+
+ +
+ 已选择 +
+ 2 +
+ 项 + 列表选项总计： + 4 + 条 +
+
清空
+
+
+ +
+ +
+
+
@@ -474,7 +549,7 @@
- + 搜索
@@ -485,11 +560,11 @@
- + 创建小组
- + 随机分组
@@ -513,12 +588,98 @@
组员名单 >
-
+
+
+
+
+
+
- +
+
+
全能小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+
+
+
+
+
+
+
+
+
+
+
宇宙第一最强小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+
+
+
+
+
+
+
+
+
+
+
天天向上小组
+
+ . . . +
+
编辑
+
删除
+
+
+
+
组长：小李
+
+
进度
+ +
+
+
组员名单 >
+
+
+
+
+
+
+
+
@@ -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%); " >
@@ -625,13 +782,13 @@ :closable="false" wrapClassName="doublepro" width="624px" - height="476px" + height="332px" >
- 创建多层项目 + 创建小组
-
项目名称:
+
小组名称:
-
-
-
-
- -
-
分类:
-
-
@@ -681,26 +821,11 @@ src="../../assets/images/basicinfo/asterisk.png" />
-
项目经理:
-
- -
-
-
-
- -
-
资源归属:
+
小组长:
@@ -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; + } + } } } }