From 27b783c10ec4ad6abcb1470118545b1cacf3e0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 10 Oct 2022 14:06:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ResearchManage.vue | 722 ++++++++++++++++++++------ 1 file changed, 557 insertions(+), 165 deletions(-) diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index c40e72e1..e19da759 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -1,174 +1,566 @@ - + - \ No newline at end of file + .btns { + display: flex; + // flex-wrap: wrap; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + 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: rgba(64, 158, 255, 1); + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + .search { + width: 15px; + height: 17px; + background-image: url("../../assets/images/courseManage/search1.png"); + } + } + .btn2 { + .search { + width: 16px; + height: 18px; + background-image: url("../../assets/images/courseManage/reset1.png"); + } + } + .btn3 { + margin-right: 0px; + .search { + width: 17px; + height: 18px; + background-image: url("../../assets/images/courseManage/add1.png"); + } + } + .btn1:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/search0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn2:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/reset0.png"); + } + .btnText { + color: #ffffff; + } + } + .btn3:hover { + background: rgba(64, 158, 255, 1); + .search { + background-image: url("../../assets/images/courseManage/add0.png"); + } + .btnText { + color: #ffffff; + } + } + } + } + .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; + } + } + .out { + display: block; + position: absolute; + top: 120px; + width: 600px; + // height: 525px; + background-color: #fff; + + box-shadow: 0 0 10px rgba(118, 136, 166, 0.21); + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + .top { + width: 100%; + height: 68px; + + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + display: flex; + align-items: center; + .topimg { + width: 18px; + height: 18px; + margin-left: 27px; + } + .topc { + color: #000000; + font-size: 16px; + margin-left: 8px; + } + } + .mid { + width: 100%; + height: 100%; + background-color: #fff; + display: flex; + flex-direction: column; + align-items: center; + .d { + // margin-top: 8px; + // color: #ff4e4e; + margin-left: -5px; + } + .name { + width: 78%; + // background-color: lightcoral; + display: flex; + margin-top: 20px; + align-items: center; + height: 40px; + // border: 1px solid black; + + .inname { + color: #6f6f6f; + font-size: 14px; + margin-left: 7px; + } + .in { + margin-left: 14px; + width: 81%; + .ant-input { + border-radius: 5px; + // height: 120%; + width: 100%; + height: 40px; + } + } + } + .btn { + width: 33%; + margin-top: 30px; + display: flex; + justify-content: space-between; + margin-bottom: 30px; + .samtn { + width: 100px; + height: 40px; + font-size: 14px; + border: 1px solid #4ea6ff; + border-radius: 8px; + cursor: pointer; + } + .btn1 { + background-color: #fff; + color: #4ea6ff; + } + .btn2 { + margin-left: 10px; + background-color: #4ea6ff; + color: #fff; + } + } + } + } + .unout { + display: none; + } + + .opa { + display: flex; + justify-content: right; + .opacation { + font-size: 14px; + font-weight: 400; + color: #4ea6ff; + // line-height: 36px; + .activecls { + display: inline-block; + } + .errorCls { + display: none; + } + .more { + position: relative; + .moreArrow { + width: 13px; + height: 7px; + display: inline-block; + background-image: url("../../assets/images/navtop/down.png"); + background-size: 100%; + margin: 2px; + margin-left: 7px; + } + .moreItems { + width: 80px; + height: 70px; + 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: 0px; + top: 18px; + z-index: 100; + } + } + } + } +} + From 4a78e0210f84c5030e57e7ca01548f109c62442d Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 10 Oct 2022 18:13:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E6=88=90=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=85=B3=E5=8D=A1=E7=BB=86=E8=8A=82=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/leveladd/add.png | Bin 0 -> 781 bytes src/assets/images/leveladd/an.png | Bin 0 -> 950 bytes src/assets/images/leveladd/ce.png | Bin 0 -> 1074 bytes src/assets/images/leveladd/diao.png | Bin 0 -> 1398 bytes src/assets/images/leveladd/gan.png | Bin 0 -> 352 bytes src/assets/images/leveladd/huo.png | Bin 0 -> 1136 bytes src/assets/images/leveladd/kao.png | Bin 0 -> 1047 bytes src/assets/images/leveladd/mian.png | Bin 0 -> 1007 bytes src/assets/images/leveladd/tao.png | Bin 0 -> 1111 bytes src/assets/images/leveladd/tou.png | Bin 0 -> 1205 bytes src/assets/images/leveladd/wai.png | Bin 0 -> 1403 bytes src/assets/images/leveladd/xiang.png | Bin 0 -> 785 bytes src/assets/images/leveladd/z1.png | Bin 0 -> 280 bytes src/assets/images/leveladd/z2.png | Bin 0 -> 137 bytes src/assets/images/leveladd/zai.png | Bin 0 -> 1113 bytes src/assets/images/leveladd/zhi.png | Bin 0 -> 940 bytes src/assets/images/leveladd/zuo.png | Bin 0 -> 1062 bytes src/views/learningpath/LevelAdd.vue | 16 +- src/views/learningpath/LevelAddDetail.vue | 931 +++++++++++++++++++++- 19 files changed, 941 insertions(+), 6 deletions(-) create mode 100644 src/assets/images/leveladd/add.png create mode 100644 src/assets/images/leveladd/an.png create mode 100644 src/assets/images/leveladd/ce.png create mode 100644 src/assets/images/leveladd/diao.png create mode 100644 src/assets/images/leveladd/gan.png create mode 100644 src/assets/images/leveladd/huo.png create mode 100644 src/assets/images/leveladd/kao.png create mode 100644 src/assets/images/leveladd/mian.png create mode 100644 src/assets/images/leveladd/tao.png create mode 100644 src/assets/images/leveladd/tou.png create mode 100644 src/assets/images/leveladd/wai.png create mode 100644 src/assets/images/leveladd/xiang.png create mode 100644 src/assets/images/leveladd/z1.png create mode 100644 src/assets/images/leveladd/z2.png create mode 100644 src/assets/images/leveladd/zai.png create mode 100644 src/assets/images/leveladd/zhi.png create mode 100644 src/assets/images/leveladd/zuo.png diff --git a/src/assets/images/leveladd/add.png b/src/assets/images/leveladd/add.png new file mode 100644 index 0000000000000000000000000000000000000000..aecfb63ecba2f993725ce6f46acd06d2e74ef92e GIT binary patch literal 781 zcmV+o1M>WdP)Px%$4Nv%R5(v{lv{{ZWfaGM|L;sX8cb@UK4_+b34>yzk)pzkiO#v~?F=}nR1bpm zWYF!Q!eAg#sF$94kf4j`n4gW@FW`QoFLy`J?~g|w(a3;()BZUB4Q@tSirI8b zkAn5#bQ80S#P*qj!?%Z@%RsEswh;M!V3U!q;O!jJWyCCug+LQ925f^0<*$c84K^18_>k=v+-(4G&>>StUGyW!Ft>p{ZT*oAQ z|Ife9AG8U5FQPl++qkhQwA5 zCX-`1F((z2|9B9ON>5PddJ&%}AH9)6(suO%PhqT9F*^2tQ)|`IQp_d!Ybr#^E~R5% z108Lj!eIOrVntFK@Hq_JNKCXZJI2w_KO67bz_tO`iGB0XHjjP^s^M0Q*MW&Zvhr7f z8NjsUUkO}==#}9&9R*2;sO?Gc3-B}obATJQCn4uAYfbsrk)_@P08A*?gkWz200000 LNkvXXu0mjfi{N)* literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/an.png b/src/assets/images/leveladd/an.png new file mode 100644 index 0000000000000000000000000000000000000000..722e73e2f4b7e9e919da028a672c47237cc30513 GIT binary patch literal 950 zcmV;n14;aeP)Px&a7jc#R7gvumP=@qR~*HE_kJ@A@ezwl7rL=n>S8KbN)#~&q7h9y z5K@GaCmQS_29S{!=N4A~zN(z>mvZ8I%8$H8qSn2T_OG zw5nfbV?hdBMym<#A)g7723C5AI;{?9b!Rt9Ey;jnCXd2ISO}Z2$-qweajkkBPbrfWS0$|_GHFJ#4TrE>5xYgAf{Cxw4Yl&qAWX0kvK>F9IUg&$61xZ_7Yp1+f zyVbb!A!TTgOC;Lxb2F1P(7X4r?{}zX$(UTN>T?%uLJnn}8gGiRV=*`kdrxL+mhZX~7vS1GH*s_O_<`zm*l|3OFlKbVuT0Uqt}+6>cVI}) zk%DzU!nBrg&;ec#z`>p@BU_`6-6qbeP@f>>(pG4lGd`fcM{wb8mXQVeb&s+2X#|mj zH+3@nvf|VBPH$tR4u^VRppwIA<6dKPERGI;x`RFEehJIxkBwFLP59?YQ$qM;=qp>J z3sBv__4`oq$q*zg&4Oj$`6ifyDNN4v=Yoh*`L2^lx&FWhV_>IX$|U%9Hq4q1EfXEu zn?ZQ|3~oMdk}J+U71I0St+I_E*}X8iat|uiB#}cB2X<1sFqRI{%y(%iKGMYA)(pSx zH+G>sKx$>@q?p(-f1uMK8L(7p+vg-8{%K%3511wp9VN}~GeK;PETgW2RnWzl$#_80 zjWLIbZ=AlBcOC9V<1Qx|5HG>UFzv4q}+AO%D3f62~*#O(rsv6YzE1>BxaaMO+zcU#;KvzIkf6f?QQ)Z Y0GEU7dNa#Em;e9(07*qoM6N<$f)o+MTL1t6 literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/ce.png b/src/assets/images/leveladd/ce.png new file mode 100644 index 0000000000000000000000000000000000000000..9f058e9c9401cf4ae950ea0497bd6fe82927c655 GIT binary patch literal 1074 zcmV-21kL-2P)Px&>`6pHR7gvmmS1REMRd_cU?hZsZK1d} zhgU9W1YLwT27!={Ob8QA3xsGzUeyXL3PMvdLZl>Z?QPDbZhPYS{W<4%&e@UK80UR? z&+k2-@AEw0-}C%rU_i5T53rFE^K&4#51?fC_K`eGzbCE>S9dAlALro;WH}=j3%-)g z@9GJJ=Su>m%)W8||P*FLk+}! z)Selz24VsyWXmB{ThtU4)I?%0x|i)5)HZ@dSQ3fLLM9ZlWl%LjOo^o|rtAMeTtM~F z7P9RNhAh$${M6AM&bewYeOWyhB<|7JFFTZ(Ji((rpqAhEwFMCT)Ga| z#*2x7{5o`hxh!^9nUV+bavE73)_wKc<@P0(C| zljq>at3Ep>fQ&*qkEo`QSV*T*U~V(K{xq~WHE>`UejBNz*Vb4Dmd}UnYyFy2=L0Ah zOUw+NAE>&rB)*TSGsw;ju;f0t@Fy(pfXOL%=WDoe+Y7O^3)`S`9gN?GV?V+5n?7Q< z@BF?jq{~1vKw6q$$3_qN@)!8@yieaN>*0@o;NZ6~33SYbu5~_=L*K*LtqLRx5lh{U zqpH!8rp`9*W6NOu(rSpazQF25@WLwi`5Jt48J=AMZA~!v9sD&>4+#z~Wam*;7iMtU znkDekqh8_X7h&jv4?k@|&#ZtamijffCgJ@b;PG`j~^3FM#e%-dX$3 zz^JJ-_r&fX@X$ioy4r(=FT-b-lA0v@&216iO$zBg?l)|-sYTb(;$1cNuiI>u78GF_ ztX&N4%`kig?o3w;aR#VBEL(+ipHMABk{@!n4Ip7}`0f$i6+1~i#6%a;^O0)WE?hlk z2}wIh?AlIrY(ueg7^wH8k0|!LMv$_Yp!jZ(w2Oyq6|(!3kEkk=Fu0gAA7Q=ULh$P000^Y1^@s6LVfqm00001b5ch_0Itp) z=>Px)FiAu~R7gvWmThblRTPHbbMNeQw?a#8S$5k}sgQ~VT&jSu@|_Sg5K#z*m>7*3 zk|rjo(LYACeu0vp2_}j}G!SgHl@HM$Qeq+CN(4a(L_nk4cDsd8OKqV@KW45ucV?F9 zhEV3mZn|^tdCqyyd(SOln5VM-w3!>uTW=^lDFo#kz%Poh=J4FHM~B<%y{F+8-rv;v zCK1*`00AO^072+6q3+&4yR3b<{rp}-D)uEG$sw@`J}lU4HvHH>?D71GH!+ZCAe5YhrfwM=W&L*l1YupMnPgxHoy=BcP|2x@Lpvh z?#K;b?YT}QuMTkRApjlR0ca2eDtAvQKBFPA#+HO2#Qha8fK%0AH(OsnG62Z|wWL`U z39izvYM5O5n*;fwC1Dc9IT)|a25=zaO+FyYqowfy^g3p_Kmi|QdQ&O^QgIF<1ZkZo z=9!pP5Ogwjb=K*js2Idg2nd$++U@v>y=DDm`X^c;vRq_d^s(G;-D7m zmY#LVOE__*PnX63PC(jLRjnu2%!5uPp5|Q1vgioRFA6#S_GPUr$o%H$+dW`m^MxMt zSxWz{9mlVvRaINz_GI>K(sd7Sx`9Q#U>1@3T@an;0whrx2o>BOC9)vw zF4mKq$5|{a3}IeT2!eOInRg6W*p}|Wpwpv^g4A1<)xTp;Rr$YuO;?@mC^l$twJ?m@ z?c+!Pp_Q0>IHfJ@0hqI+DuS@7{WRox<*!bh?d?ASh=+E^A{WOUNCrp4m@lBlO9|T~ z`RC|@u0suzC-?g|(%eKU5pXTc09Gts7(#qhFykOcdmD8Zdrnb*Ximd-1()x6pykCJ zDPAQ)z99()K_6NobQ+Rg`+j=y$C(qq@JL%i0{WbI{qUawU7^q_URFX@?Ku-}juo_i zWlCDX>#_ilJj?hf2yESZZ^^S-u0==M5^&|xW5Jt0Je#fqAfev)I#yCMb$?4uK+@~O z05qHgs&`H)-b{;rZc9j_cqX`OLG38v4m>~&kc_5MwrvClT8R+6Nd*qTF;a(`6p7M< zN7GIvZWVfF5kWYk+nr%_qJB#Bz8MEn&j9Mvn*p9E$%Ca7c6IjZ@vj1Q87(>HKzw65 zbD+G#MFMs8mBo+GXlmJD7~*BG$w5h|F3-mo?U&JO+jy!Z4~q+P@lL7>$!i1p+!+B8 zqb0}F2>}P4L?>xWYfxeCGAP) z*GSMxDO5<$9Q~h)(;QDi?KFW+TgOE{TlrHeWRH{^rJ&VPKxP51LEzo)((v02M3#5S z-O|N$qeZJurN;_WERzP^DTxLRq0U)3YVYUKXor9O|MAglF@Vtw)&Kwi07*qoM6N<$ Eg8S=)GXMYp literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/gan.png b/src/assets/images/leveladd/gan.png new file mode 100644 index 0000000000000000000000000000000000000000..f8442bb09df0d97e33658dd3c7c5da4626ede14e GIT binary patch literal 352 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 TQQx!R00000NkvXXu0mjfFqSt^ literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/wai.png b/src/assets/images/leveladd/wai.png new file mode 100644 index 0000000000000000000000000000000000000000..18dbe64df046d9ecdadbe2bb80ca87f89dcf61fb GIT binary patch literal 1403 zcmV->1%&#EP)Px)HAzH4R7gvWmTPESRS?Jj=ic3Hc9U$AZC*ABwJD}1wV|Q34K02bX2-+eF))!PI&4(!XP4SBlROkm$`+}rff(2`}X=Bnnwt1A;WJ4aC#C>J&k(qPP z&CPaG4Q%!%_ni67%$fPm5dg5M??Pi9j8;>KeSqcl2@eFlfCaBG`P&c%=n0VU2!p@r zw<&0)gn)#}|F>ZBZV5xZOPfM;7#SS@ruN}(K`;++*(*#xExs3wwv!Dqn+v9$Bp|cM z35HwbSX>&SS=9HPKkE~omTVY#r=p`x;BBkHRMaXHxnQ){&cr#f^=3zk(n#s>!hm6W zmJ7zlAZ?Egeh!&lRCxo)z`|HMj?DQe~0|PFdwN{HPqAZ=O=M((s%HKE2ExC^#?MymH-TDu8*3M%l? zWHDO0ZEk zjDS=eKgLGcnVo?$yi!_^=}Z#G#(!N=G~8PI2g6)6S|4-4-nnxfk<>y?SWjXWt;!b%)1t#ed`BGa(iyh5C) zXyV9zn2q4)`4MMwxM5s`Ekny^NQNssK73xY1AoS6@ZQ9AM~n{^t;6%7jSO_dC{+*U zufeghEjT?lj5Ap<-G3Az>9ja76qfFp_E3HhAKteWr{~7-)y%LnX7YuJCxX?mAaQ2? zHm7k*ehDNbdK1&Gxd>(07J4Nf3dVEuz>sPS)eaJMz98DxHQ~}?6rW7>t*ZQc3Mz3V zREN>@0^XhY9R?5K+%Po{)zB7?N5WFWXr_6Dz!%j!SejlPzk<0;YQ>l#qq_>q@nUEb zk}`u+(QfXwY#2+TJ)$&>ojMq~C@FlcD&)oC;`RI)NiCu++Jop)oKs5|kCvh;JX>6Q z7fbL7CxT5W=Ez|xe}(Y z7%Ea5MiCy0bUJ@WO|);7)-|S_3RLaIgQIOHR1JiaXq_X1b^yQ zI0Z<)VrTIBjRJS!kuR9dxX3Z@M$ zr$pUTv>3bBD8u&kkXs@P#%Os?JRJ!)8U`*4!0(RCeZ|uQ)D0usS|9HPb2%LsmT2an zo{5ATmrU8}f!HS?y{p0WZEQ7|dY^T!LZ%^Qhhd51r)nPU{ufKQT)J3hf))S(002ov JPDHLkV1ldVo74aR literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/xiang.png b/src/assets/images/leveladd/xiang.png new file mode 100644 index 0000000000000000000000000000000000000000..fe1310fea335cf2d9f9d7bb73ceb7721a5e6d181 GIT binary patch literal 785 zcmV+s1Md8ZP)Px%%Sl8*R7gv$mdk1sK@^71sWFb5yoKUQ5CvTbYVVvZ5<#*M@(eB_qPw(@puU5m zF&T$ph%t!BKyaZ1T!^60AX$mS*yl)H`*e5p#nB98`chM0{r|aCAppQ^`eq#w?*qU^ zeGeS|nOl2rFOXqOm_6uUUHRglF7l1P4qu;E)ce*3%;B2PM<=h}xUdM&{|0B%gA@U_ zgsg(X5->Qxzz_S$AYBxWv*~_{fLj&C!rlNEAwY(o%ybt?eYNo4@imCY1oWdnSo^F8 z;_Ur?im1VkdCVCA{R+$D{GuA4v!3hIiQcJe7Hq8c`SZVkQiuV%Ffp)FmvV4H zp&f-$_4N~4GdjFyNO1OU&sm-Ss5`Kzq>v}ldUuVWKLEt+z|Lw5j7-)^iBwxutqd-o zm%u4j?8<5JgbDGJs>?th2FftO`P)efp`6;{W27Gg^CJTwpONmueW|>#HUVHckGq|p zh#c4`7Ok>D`O;w3R#eBoY_w}V7IPACg7X8dxX$XT14}Dwe+PcGVWPH4d66xeqz z4{Egh7|2>JEY*YTtih8}3aG(d6!Q1p z>a8;!6WR>Rwx8?W>#PigBAr~5p{-*FjuyS>XbR{G-dsQI0_T^{E)(GgJvOvqeTp&3 zH69wp1z@3dw#BWv#m4$R>P;fkV81PP*;$$zji}d3-#Xe63j+Bu2=iPZPrHWJ;bmX=vyc1UTwhtusc|FFx1R#T?E*X!YgrPNhSLG)hCJzQY~1++3zByPA8ts& P00000NkvXXu0mjf;Aw8; literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/z1.png b/src/assets/images/leveladd/z1.png new file mode 100644 index 0000000000000000000000000000000000000000..3c6bfad64e557a30537bbaad61101c30022871e6 GIT binary patch literal 280 zcmV+z0q6dSP)Px#(n&-?R5(wylRs(#aS(;S`H^5{Atn>RDY9ie&nj@0GXJ=yDMV@HNQf)-LOlP9+_FaAt( z6aNKl2{>TQW2t_EB*7LaXNyu~-lVNX_{>f}zy_!Sf52A?$s3A;G7suw_6-c!TLY)& zO^|al&HXoIk$K~^zBq_xVT4m9bF95htrZWiDk%h#*VzB}B(IXID=y^N3OW0{<6MkQ e{0>;}{D24VI(+BGODF{Z0000wZ0}~Uu-4Z#x|R_FG>*a3)z4*}Q$iB}H@GPj literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/zai.png b/src/assets/images/leveladd/zai.png new file mode 100644 index 0000000000000000000000000000000000000000..3b2310b6c29d976129211867dcd61927e8dafc58 GIT binary patch literal 1113 zcmV-f1g86mP)Px(6G=otR7gveR!fTBNz2{R85{ zy{}cW$|{JUh#;6m36q{7$s&U=0XIG-MnU7s*@X_iGMIT(ANlS*r>eTUVvhw)b=_O_ zedqC=bFKh@UYvdwS$YO(K8pf5(hMj7rniyic_0XY2ExzP;YobomJ5G2BT) zeGL?HAY5?Ysyhk4{SfH>Y&ZZ+BxMZ-QigQ-s7Bec9gQgNKzO{L@Xjq@{ZnA;FYCMg zB8gq9DiP7nv9J`v>Me{fcnd4{5@2efA}qFnA3p~+Zd84RB4^8X#y~(kL(8?I{^H) z)?fIsPgZ#=MPeO?&t+LGx3zHsc>fzU0Zi^uB<4|QdDi5;v70_bS5D~vngBlYd;++V zt&{YLg!3|ZXVW4y@6O3x2-|yY0))6*TcZaAYZ^Cu5J^cE=VKw-d36nv%#?$)`Ir!s z|9}bbV3C;7;e^0)Np6U)EY1MwDpWXuM;#MGO(@|?MNB)J8ZH>Cak^+4#CUOx3Cvev`l`96U0@pvD)#+w%T!SH%E zeov0R-Sv$=!jgFP#SGoeGe}#{A)f#e9;kRKXvGtqGM{|raneo;7z32Y4VFiC8{7Gt zviQ!uK?|A*FFyY=pjSX=nOgYI$Wj9*fs+@^6AhshNSwYd?RP)k8{rqz`yg1y*h5c% zKp8_t5FWJ5Ga5o~NWgd8^B#$_O-MQ;?f2IAL>Pp0{?G*S)>CC(n9njto?Fk^z&+{R fmHE?uHzoRC0DGgHv9+|j00000NkvXXu0mjfM?dl} literal 0 HcmV?d00001 diff --git a/src/assets/images/leveladd/zhi.png b/src/assets/images/leveladd/zhi.png new file mode 100644 index 0000000000000000000000000000000000000000..36bfb33f41f58ab14b9fd11afad9817237ed7a91 GIT binary patch literal 940 zcmV;d15^BoP)Px&W=TXrR7gv$R!vA$Q562pn{k3#B`8b;ZQ4XFD%!P@mZ>pN5aCP;wTYxng|w)| zlF~Mr6r`eo(6&X37G;qjH4sWl^h3LX>`z|`EgavCbMHNG?t4B*Cwwrxx$oU~zk9y# zeCJ&1Kd*AjguYY?+ZBLJ4Z!zQDtadmAOiT#@A>EPGdt%0`Xcju8TjjY7|fr=IU?fe zD=xZyLH!~^ZB5!PXhG9^`$gYnq@+<6x9P@$d162bc}D#eo+oB??e z0g)(poVJ^?Q6a^VG81;bXW#Q!Hlo=9a`|?8lnCD6p_D|&;IbHh#S!U9-6$Ofg!)hd z-iY0dY>YhQ@@LB65AUgcON7H-4T^N9L#hAOS?7jjz-2__u$#(J31i6M1PG@=*l*u| zr@NPwV#?g)S+CAv4#e1S8G(nQN7w_xW_cd4G6bLQUskG;&b3*fejD&<1_+kdr?XHl za&=l5}>Gj^EozBeo0xp9Zd)Y!|A< z&qC>uHlViNY?>#&p9Cf+fKn;+v)0|!Ib182`A!n@e4hq7qu@f7MAg(<1{b?5_`s`Y zz_%|ei%w`$TN7eBhc<+!z0+teU@kaIoNEKN)+M6yflq^7O2u`S9N60%qO-Q$^EHb+l{vS!#fzbGc9GgzGk% zyIz-y#|-Q~0AzO6mC2{!8>YgE&icUMv`P8T7IAZ<3Z08Y*sFj{ zSY%99^l9X#@wwZB88F_TrGmu|5A0`dz52a9&BSzWNNvIlmQV-?rvU7-LHwqXo|QgN z>d)Z`rFxwk@@@1&%GBtnI_MFO1qyFzq}PDEIwvJxtS(2AO}=*%Q04~;5pcIw(r~X@ zB*K;r);Y|ZG_dn{D}7EpMm@Ntjs`#<5waVlvnG<@D-Yc*1?oxe48T9QfOSRH_g?e> O00001ljwEP)P000~a1^@s6lq3|;00001b5ch_0Itp) z=>Px&;7LS5R7gvmmQQG0RTRd5=f2D|X;P>DE7V00T0z9UD;J8TpdvL=DE_G-v8Jh@ zPW=YhDgMF>7ZB5Wj2eDI|N9it9mfMQ;mq zX;i-MT?>1M;OZJ2`y5V8L*~loILPuijd$)d$R3u)$e-ee#~vihj)nlIn_M`z2|#b$ zdJ_z7kIBuPg`=O808V3)SY2z3=PMe!?+`!w(hSHg1wfZ(o@A&2`d6vI&imnp4Y88> zpX2@FaLr!N&SMos6BmEG_|b760J1Dr5Gu*ny3`YMO~&*uE9MnSq7hVcT7>wz~w1T<1T{b{VF=hcgSgQ1a(dEOqhEyy64D z#+L1@ zR_M1)b~52w_2T*FK@3bNl}gvx>pl!%D$$J_V9yRXH4CTa;IV;%g;fhf%rC$r_d<8I<^00H!F!ne4o=R+J{myiX#hE#gRF2- z%Oo~GHBYU)kZ9s_t^J8+TNnT0k*KbAE}AON6coHHk!aeZFsvPtC!J`Ohjq8oq!|*ovb{?kB!p?g-Q`Z-#TZY#re&4&X@vSae>w~4g^z8b{kQP2vBrgq=Po=}ke@5f3y0cbDLHnUL-Vs4NJKDdBLcVTk> zSE8#{Rw(vS@e>~&L)<{D#->$0s^y)(nnZ){!}nJC4N(4niGSoq@e?0y!YxlC?z(0m zdyOWBSOBf|PH*|r$=q}D_?9=~$K9ci`|%vW$(`V?YI^4vmYrv63JXSP{*|SJdNslK=n!07*qoM6N<$f)gAMlK=n! literal 0 HcmV?d00001 diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index a031e5aa..e3bc8550 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -185,8 +185,12 @@
关卡晋级规则
-
- +
+ 启用关卡自动规则加入
若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据 @@ -758,7 +762,7 @@ export default { position: absolute; // margin-top: 10px; left: 0; - top: 5px; + top: 3px; } .yulan { // color: yellow; @@ -773,10 +777,14 @@ export default { .twomain { margin-left: 20px; margin-top: 20px; + .ant-switch-checked { + background-color: #5dc988; + } .info { margin-left: 10px; color: #6f6f6f; font-size: 14px; + // margin-top: 10px; } .infor { margin-left: 38px; @@ -818,7 +826,7 @@ export default { position: relative; .inl { position: absolute; - top: 5px; + top: 2px; } .sh { margin-left: 23px; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 21ef46bf..6dc730ce 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1,12 +1,939 @@ - \ No newline at end of file From e843bef08faa761527c10aac3cac2410608dab6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 10 Oct 2022 18:18:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E8=B0=83=E7=A0=94=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC,=E5=88=9B=E5=BB=BA=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E5=92=8C=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/projectadd/picture.png | Bin 0 -> 24887 bytes src/assets/images/research/export.png | Bin 0 -> 1166 bytes src/assets/images/research/picture.png | Bin 0 -> 9210 bytes src/components/BreadCrumb.vue | 13 ++ src/views/projectcenter/TaskPage.vue | 33 +++ src/views/research/ManagePage.vue | 256 +++++++++++++++++++++++ src/views/research/ResearchAdd.vue | 9 +- src/views/research/ResearchManage.vue | 6 +- 8 files changed, 310 insertions(+), 7 deletions(-) create mode 100644 src/assets/images/projectadd/picture.png create mode 100644 src/assets/images/research/export.png create mode 100644 src/assets/images/research/picture.png create mode 100644 src/views/projectcenter/TaskPage.vue create mode 100644 src/views/research/ManagePage.vue diff --git a/src/assets/images/projectadd/picture.png b/src/assets/images/projectadd/picture.png new file mode 100644 index 0000000000000000000000000000000000000000..bd3b370065705cc14c8adf8b75db24fb5c43638f GIT binary patch literal 24887 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/research/export.png b/src/assets/images/research/export.png new file mode 100644 index 0000000000000000000000000000000000000000..78b8331f748358bd1d94631eab44ee3dc8dc716e GIT binary patch literal 1166 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 QZU6uP07*qoM6N<$f)+dKG5`Po literal 0 HcmV?d00001 diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 11e7aaa1..78e6e7d2 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -134,6 +134,19 @@ export default { }, ]; } + if (n === "/researchmanage" || n === "/ResearchManage") { + state.list = [ + { + name: "调研管理", + href: "", + // href: "#/researchmanage", + }, + { + name: "管理", + href: "", + } + ]; + } if (n === "/systemmanage" || n === "/SystemManage") { state.list = [ { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue new file mode 100644 index 00000000..d982d1ef --- /dev/null +++ b/src/views/projectcenter/TaskPage.vue @@ -0,0 +1,33 @@ + + + \ No newline at end of file diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue new file mode 100644 index 00000000..b6de2e90 --- /dev/null +++ b/src/views/research/ManagePage.vue @@ -0,0 +1,256 @@ + + + + + + \ No newline at end of file diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index a36dde4c..29dc7116 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -59,9 +59,13 @@
删除
-
- +
+
图片名称1.jpg
+
@@ -187,6 +191,7 @@ } } .picture { + width: 100px; display: flex; flex-direction: column; margin-top: 20px; diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index e19da759..2b5c3f45 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -69,11 +69,7 @@ @expand="expandTable" :pagination="false" /> -
-
@@ -264,7 +260,7 @@ export default { 基础信息 - 管理 + 管理 复制 撤回 结束 From f8ded3322fb4286853883fe3990aec28342d805f Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 10 Oct 2022 18:25:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=BC=80=E8=AF=BE=20=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=BC=80=E8=AF=BE=20=E6=8E=88=E6=9D=83=20=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86=20=E9=9D=A2?= =?UTF-8?q?=E6=8E=88=E8=AF=BE=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95=E3=80=81?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/coursewareManage/detail.png | Bin 0 -> 311 bytes src/views/courselibrary/CoursewareManage.vue | 1405 ++++++++++++++++- 2 files changed, 1370 insertions(+), 35 deletions(-) create mode 100644 src/assets/images/coursewareManage/detail.png diff --git a/src/assets/images/coursewareManage/detail.png b/src/assets/images/coursewareManage/detail.png new file mode 100644 index 0000000000000000000000000000000000000000..542a42afe3269d264da5f0431810d9e639b1b7a7 GIT binary patch literal 311 zcmV-70m%M|P)Px#@kvBMR5(wyld(#~P!L7WjfL%gg0Ns?vz3LFKaiM4!A&FLM+g>bxnLm(+giP( zu#qTOuBDBgtzY0bm@8RGqZ>DCaJt9LoHyt3MgV(-cMQii!}`1|B;KfaDKiBn!I{O0 z;58DD%bM%_ry14vM&e9K;TxOxhq11^G&eO#?kmHl;@q<}ae05J=T!h{;oZv2egM+o z5fOt1)&^b(NN+u;);TwG$9c$1%S?CQr)!;{t41pz4n7iWw1LV@7j^Fc0KFBG+!Mq0 zB9P#t9P8j$g(P?%*!uGutgO)cEB9WeW}Pc@Du_EO1k6*t&R^S6x+@&EO0fU{002ov JPDHLkV1jm9h(rJY literal 0 HcmV?d00001 diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index dda5704a..0e8fd3af 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -88,7 +88,7 @@
请选择课程类型 -
x
+
x
@@ -181,13 +181,14 @@ -
+
新建面授课 -
x
+
x
课程信息
@@ -385,28 +386,436 @@ :scroll="{ x: 800 }" expandRowByClick="true" @expand="expandTable" - :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() - // }) - }, - }" + :pagination="false" />
+ + + +
+
+
+
+
+
+ 在线课程管理 +
x
+
+
+
课程：BMOT2021年职级晋升-安全管理（高级）
+
+
类型：
+
录播课
+
内容分类：
+
领导力
+
状态：
+
已审核
+
+
+ + + 报名管理 + + + 学习记录 + + + 资源完成情况 + + +
+
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+
+
搜索
+
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+
+
+ 面授课程管理 +
x
+
+
+
课程：BMOT2021年职级晋升-安全管理（高级）
+
+
类型：
+
录播课
+
内容分类：
+
领导力
+
状态：
+
已审核
+
+
+ + + 报名管理 + + + 学习记录 + + +
+
+
+ + 状态 + 已通过 + 未审核 + 管理员拒绝 + +
+
+ +
+
+
+
+
搜索
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ 查看详情 +
x
+
+
+ + +
+
+
取消
+
+
+
+ + + +
+
+
+
+
+
+ 授权 +
x
+
+
+ +
+
+
搜索
+
+
+
+
重置
+
+
+
+
i
+
已选择 1 项
+
列表选项总计：5条
+
+
+ + + +
+
+
+ + + +
+
+
+
+
+
+ 开课 +
x
+
+
+ + +
+ +
+
+
+
搜索
+
+
+
+
重置
+
+
+
+
新建开课
+
+
+
+ +
+
+
+ + + +
+
+
+
+
+ 新建开课 +
x
+
+
面授名称：管理者的专属面授课
+
+ ⃰ + 开课名称 +
+ +
+
+
+ ⃰ + 地点 +
+ +
+
+
+
+ 面授时间 + +
+
+
+ ⃰ + 授课教师 +
+ +
+
+
+
+ 报名设置 + 是否允许公开报名 +
+
+
+
+ 签到设置 + 是否允许未报名的学员签到 + 签到是否需要口令 +
+
+
+
+ 评估设置 + 是否需要评估 +
+
+
+
+ 完成规则 + 报名即完成 + 签到即完成 + 请假算完成 +
+
+
+
+ 附件 +
+
+ 上传附件 +
+
+
+
+ 支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip +
+
+
+
取消
+
+
+
确定
+
+
+
+
+